diff --git a/@ecomplus/storefront-components/src/html/ShippingCalculator.html b/@ecomplus/storefront-components/src/html/ShippingCalculator.html
index 0ae1cb88a..9d43e903f 100644
--- a/@ecomplus/storefront-components/src/html/ShippingCalculator.html
+++ b/@ecomplus/storefront-components/src/html/ShippingCalculator.html
@@ -55,7 +55,8 @@
           leave-active-class="animated fadeOutDown"
         >
           <div
-            v-if="canSelectServices && !canAutoSelectService && selectedService === null"
+            v-if="canSelectServices && !canAutoSelectService &&
+              selectedService === null && shippingServices.length"
             class="shipping-calculator__label"
           >
             <i class="i-arrow-down animated wobble"></i>
diff --git a/@ecomplus/storefront-components/src/js/CartQuickview.js b/@ecomplus/storefront-components/src/js/CartQuickview.js
index 425425271..4aeb699a4 100644
--- a/@ecomplus/storefront-components/src/js/CartQuickview.js
+++ b/@ecomplus/storefront-components/src/js/CartQuickview.js
@@ -95,7 +95,7 @@ export default {
       this.selectedShippingPrice = service.shipping_line
         ? service.shipping_line.total_price
         : 0
-    },
+    }
   },
 
   created () {
diff --git a/@ecomplus/storefront-components/src/js/ShippingCalculator.js b/@ecomplus/storefront-components/src/js/ShippingCalculator.js
index d63286827..6d37293b6 100644
--- a/@ecomplus/storefront-components/src/js/ShippingCalculator.js
+++ b/@ecomplus/storefront-components/src/js/ShippingCalculator.js
@@ -208,6 +208,8 @@ export default {
           })
           if (this.canAutoSelectService) {
             this.setSelectedService(0)
+          } else {
+            this.selectedService = null
           }
           this.hasPaidOption = Boolean(this.shippingServices.find(service => {
             return service.shipping_line.total_price || service.shipping_line.price