diff --git a/plugins/woocommerce-blocks/src/StoreApi/Schemas/BillingAddressSchema.php b/plugins/woocommerce-blocks/src/StoreApi/Schemas/BillingAddressSchema.php
index 051b3dd2a33..d8c899e381d 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/Schemas/BillingAddressSchema.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/Schemas/BillingAddressSchema.php
@@ -95,7 +95,7 @@ class BillingAddressSchema extends AbstractAddressSchema {
 		if ( ( $address instanceof \WC_Customer || $address instanceof \WC_Order ) ) {
 			$billing_country = $address->get_billing_country();
 			$billing_state   = $address->get_billing_state();
-			$valid_states    = wc()->countries->get_states( $billing_country );
+			$valid_states    = array_filter( (array) wc()->countries->get_states( $billing_country ) );
 
 			if ( ! empty( $billing_state ) && count( $valid_states ) && ! in_array( $billing_state, $valid_states, true ) ) {
 				$billing_state = '';
diff --git a/plugins/woocommerce-blocks/src/StoreApi/Schemas/ShippingAddressSchema.php b/plugins/woocommerce-blocks/src/StoreApi/Schemas/ShippingAddressSchema.php
index bf89ec2577e..fb3175afd0b 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/Schemas/ShippingAddressSchema.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/Schemas/ShippingAddressSchema.php
@@ -44,7 +44,7 @@ class ShippingAddressSchema extends AbstractAddressSchema {
 
 			$shipping_country = $address->get_shipping_country();
 			$shipping_state   = $address->get_shipping_state();
-			$valid_states     = wc()->countries->get_states( $shipping_country );
+			$valid_states     = array_filter( (array) wc()->countries->get_states( $shipping_country ) );
 
 			if ( ! empty( $shipping_state ) && count( $valid_states ) && ! in_array( $shipping_state, $valid_states, true ) ) {
 				$shipping_state = '';