diff --git a/modules/ppcp-applepay/resources/js/Context/BaseHandler.js b/modules/ppcp-applepay/resources/js/Context/BaseHandler.js
index 69745082e..8f5926c70 100644
--- a/modules/ppcp-applepay/resources/js/Context/BaseHandler.js
+++ b/modules/ppcp-applepay/resources/js/Context/BaseHandler.js
@@ -24,7 +24,7 @@ class BaseHandler {
     }
 
     shippingAllowed() {
-        return true;
+        return this.buttonConfig.product.needsShipping;
     }
 
     transactionInfo() {
diff --git a/modules/ppcp-applepay/resources/js/Context/PayNowHandler.js b/modules/ppcp-applepay/resources/js/Context/PayNowHandler.js
index a12fd3636..e5f382970 100644
--- a/modules/ppcp-applepay/resources/js/Context/PayNowHandler.js
+++ b/modules/ppcp-applepay/resources/js/Context/PayNowHandler.js
@@ -12,10 +12,6 @@ class PayNowHandler extends BaseHandler {
         return true;
     }
 
-    shippingAllowed() {
-        return false;
-    }
-
     transactionInfo() {
         return new Promise(async (resolve, reject) => {
             const data = this.ppcpConfig['pay_now'];