diff --git a/www/extras/shop/cart.js b/www/extras/shop/cart.js
index 92e92ad44..0781d5403 100644
--- a/www/extras/shop/cart.js
+++ b/www/extras/shop/cart.js
@@ -344,14 +344,16 @@
                     method: 'ajaxPrices'
                 };
 
-            if (addressIdCounts(shipping)) {
-                params.shippingId = shipping;
-            }
-
             if (addressIdCounts(billing)) {
                 params.billingId = billing;
             }
 
+            if (this.sameShipping()) {
+                params.shippingId = params.billingId;
+            } else if (addressIdCounts(shipping)) {
+                params.shippingId = shipping;
+            }
+
             this.request('GET', params, function (o) {
                 var response = self.json.parse(o.responseText);