diff --git a/addons/website_sale/static/src/js/website_sale_delivery.js b/addons/website_sale/static/src/js/website_sale_delivery.js
index 11b5b678c21..53cd0b383ff 100644
--- a/addons/website_sale/static/src/js/website_sale_delivery.js
+++ b/addons/website_sale/static/src/js/website_sale_delivery.js
@@ -205,11 +205,12 @@ publicWidget.registry.websiteSaleDelivery = publicWidget.Widget.extend({
     _disablePayButtonNoPickupPoint : function (ev){
         const selectedCarrierEl = ev.currentTarget.closest('.o_delivery_carrier_select');
         const address = selectedCarrierEl.querySelector('.o_order_location_address').innerText
-        const isPickUp = selectedCarrierEl.lastChild.previousSibling.children;
+        const orderLocationContainer = selectedCarrierEl.querySelector('.o_order_location').parentNode;
+        const hasPickUpLocations = selectedCarrierEl.querySelector('.o_list_pickup_locations');
 
         document.querySelectorAll('.error_no_pick_up_point').forEach(el => el.remove());
 
-        if (isPickUp.length > 1 && (address == "" || isPickUp[0].classList.contains("d-none"))) {
+        if (hasPickUpLocations && (address == "" || orderLocationContainer.classList.contains("d-none"))) {
             this._disablePayButton();
             const errorNode = document.createElement("i");
             errorNode.classList.add("small", "error_no_pick_up_point","ms-2");