diff --git a/CHANGELOG.md b/CHANGELOG.md
index 293b5671ca..d6d4f0a5c9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,6 +40,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix Original Price Calculation typo - @akucharczyk / @lukaszjedrasik (#5472)
 - Purge loader works properly with dynamic config reload - @Fifciu
 - Multi-tab cart-sync in multi-store environment - @cewald (#5711, #5732)
+- Incorrect load of default address in checkout - @lukaszjedrasik ([#4682](https://github.com/vuestorefront/vue-storefront/issues/4682))
 
 ### Changed / Improved
 
diff --git a/core/modules/checkout/components/Shipping.ts b/core/modules/checkout/components/Shipping.ts
index d7a8fa6ce3..b8d96defa5 100644
--- a/core/modules/checkout/components/Shipping.ts
+++ b/core/modules/checkout/components/Shipping.ts
@@ -62,9 +62,9 @@ export const Shipping = {
     shipToMyAddress: {
       handler () {
         this.useMyAddress()
-      },
-      immediate: true
-    }
+      }
+    },
+    '$route.hash': 'useMyAddress'
   },
   mounted () {
     this.checkDefaultShippingAddress()