diff --git a/Civi/FormProcessor/Type/CountryIsoCodeType.php b/Civi/FormProcessor/Type/CountryIsoCodeType.php
index 1d56fb5bb8a83a2b38c84f78e994db8ec3e2b0f9..5509adbc3d740a4ebaa094aa2244b2620fc48574 100644
--- a/Civi/FormProcessor/Type/CountryIsoCodeType.php
+++ b/Civi/FormProcessor/Type/CountryIsoCodeType.php
@@ -42,7 +42,7 @@ class CountryIsoCodeType extends AbstractType implements OptionListInterface {
   }
 
   public function getOptions($params) {
-    $countries = \CRM_Core_PseudoConstant::country();
+    $countries = \CRM_Core_PseudoConstant::country(FALSE, FALSE);
     $iso_codes = \CRM_Core_PseudoConstant::countryIsoCode();
     $options = [];
     foreach ($iso_codes as $id => $iso_code) {
diff --git a/Civi/FormProcessor/Type/CountryType.php b/Civi/FormProcessor/Type/CountryType.php
index 0d9de77cb452d0433e7f1d3fdd95a4a19b12a81f..64e069834dce05462e3170389476aa61bd165cce 100644
--- a/Civi/FormProcessor/Type/CountryType.php
+++ b/Civi/FormProcessor/Type/CountryType.php
@@ -105,7 +105,7 @@ class CountryType extends AbstractType implements OptionListInterface {
       return;
     }
     $use_name = $this->configuration->get('use_name_as_value') ? TRUE : FALSE;
-    $countries = \CRM_Core_PseudoConstant::country();
+    $countries = \CRM_Core_PseudoConstant::country(FALSE, FALSE);
     foreach ($countries as $key => $country) {
       $value = $key;
       if ($use_name) {
diff --git a/Civi/FormProcessor/Type/StateProvinceType.php b/Civi/FormProcessor/Type/StateProvinceType.php
index 67ddba6b9d7a2e039a092a55f020718e720754af..ecaf829d6296158ec738410fde6e10c8f8aa5590 100644
--- a/Civi/FormProcessor/Type/StateProvinceType.php
+++ b/Civi/FormProcessor/Type/StateProvinceType.php
@@ -106,7 +106,7 @@ class StateProvinceType extends AbstractType implements OptionListInterface {
       return;
     }
     $use_name = $this->configuration->get('use_name_as_value') ? TRUE : FALSE;
-    $states = \CRM_Core_PseudoConstant::stateProvince();
+    $states = \CRM_Core_PseudoConstant::stateProvince(FALSE, FALSE);
     foreach ($states as $key => $state) {
       $value = $key;
       if ($use_name) {