diff --git a/includes/class-wc-gzd-checkout.php b/includes/class-wc-gzd-checkout.php
index 626c29ce6..4a8d61b57 100644
--- a/includes/class-wc-gzd-checkout.php
+++ b/includes/class-wc-gzd-checkout.php
@@ -808,7 +808,7 @@ public function set_free_shipping_filter( $cart ) {
 	}
 
 	public function free_shipping_auto_select( $rates ) {
-		$do_check = is_checkout() || is_cart() || self::$force_free_shipping_filter;
+		$do_check = is_checkout() || is_cart() || WC_germanized()->is_rest_api_request() || self::$force_free_shipping_filter;
 
 		if ( ! $do_check ) {
 			return $rates;
diff --git a/src/Blocks/Checkout.php b/src/Blocks/Checkout.php
index 76b161bea..45e1e28aa 100644
--- a/src/Blocks/Checkout.php
+++ b/src/Blocks/Checkout.php
@@ -1,6 +1,7 @@
 <?php
 namespace Vendidero\Germanized\Blocks;
 
+use Automattic\WooCommerce\Blocks\Domain\Services\CheckoutFields;
 use Automattic\WooCommerce\StoreApi\Exceptions\RouteException;
 use Automattic\WooCommerce\StoreApi\Schemas\V1\CartSchema;
 use Automattic\WooCommerce\StoreApi\Schemas\V1\CheckoutSchema;
@@ -242,8 +243,17 @@ function( $errors, $fields, $group ) {
 						return $errors;
 					}
 
-					$country   = isset( $fields['country'] ) ? $fields['country'] : $fields['shipping_country'];
-					$address_1 = isset( $fields['address_1'] ) ? $fields['address_1'] : $fields['shipping_address_1'];
+					$country   = isset( $fields['country'] ) ? $fields['country'] : $fields[ "{$group}_country" ];
+					$address_1 = isset( $fields['address_1'] ) ? $fields['address_1'] : $fields[ "{$group}_address_1" ];
+
+					/**
+					 * Somehow Woo calls the filter differently on my account address save action
+					 * by handing over the registered fields instead of the actual values.
+					 */
+					if ( is_array( $country ) ) {
+						$country   = isset( $_POST[ $group . '_country' ] ) ? wc_clean( wp_unslash( $_POST[ $group . '_country' ] ) ) : ''; // phpcs:ignore WordPress.Security.NonceVerification.Missing
+						$address_1 = isset( $_POST[ $group . '_address_1' ] ) ? wc_clean( wp_unslash( $_POST[ $group . '_address_1' ] ) ) : ''; // phpcs:ignore WordPress.Security.NonceVerification.Missing
+					}
 
 					if ( ! empty( $country ) && ! empty( $address_1 ) && apply_filters( 'woocommerce_gzd_checkout_validate_street_number', true, $fields ) ) {
 						$countries = array();