diff --git a/themes/default/checkout.blade.php b/themes/default/checkout.blade.php
index ccbc609d..45f161d5 100644
--- a/themes/default/checkout.blade.php
+++ b/themes/default/checkout.blade.php
@@ -357,6 +357,10 @@
             return
           }
 
+          if (key == 'shipping_address_id' && this.same_as_shipping_address) {
+            this.form.payment_address_id = id
+          }
+
           this.form[key] = id
 
           $http.put('/checkout', this.form).then((res) => {