diff --git a/db/routines/vn/functions/address_hasDelivery.sql b/db/routines/vn/functions/address_hasDelivery.sql
index f37edbd34..719cc14f0 100644
--- a/db/routines/vn/functions/address_hasDelivery.sql
+++ b/db/routines/vn/functions/address_hasDelivery.sql
@@ -1,5 +1,9 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`address_hasDelivery`(vSelf INT, vLanded DATE)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`address_hasDelivery`(
+	vSelf INT,
+	vAgencyModeFk INT,
+	vLanded DATE
+)
 	RETURNS BOOL
 	DETERMINISTIC
 BEGIN
@@ -15,7 +19,11 @@ BEGIN
 
 	CALL zone_getAgency(vSelf, vLanded);
 
-	SELECT EXISTS (SELECT TRUE FROM tmp.zoneGetAgency) INTO vHasDelivery;
+	SELECT EXISTS(
+		SELECT TRUE
+			FROM tmp.zoneGetAgency
+			WHERE agencyModeFk = vAgencyModeFk
+	) INTO vHasDelivery;
 
 	RETURN vHasDelivery;
 
diff --git a/db/routines/vn/procedures/zone_getAddresses.sql b/db/routines/vn/procedures/zone_getAddresses.sql
index 0e52abe1c..05267c14c 100644
--- a/db/routines/vn/procedures/zone_getAddresses.sql
+++ b/db/routines/vn/procedures/zone_getAddresses.sql
@@ -1,6 +1,7 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`zone_getAddresses`(
 	vSelf INT,
+	vAgencyModeFk INT,
 	vShipped DATE,
 	vDepartmentFk INT
 )
@@ -52,7 +53,7 @@ BEGIN
 			AND ct.code = 'normal'
 			AND bt.code <> 'worker'
 			AND (d.id = vDepartmentFk OR vDepartmentFk IS NULL)
-			AND vn.address_hasDelivery(c.defaultAddressFk, vShipped)
+			AND vn.address_hasDelivery(c.defaultAddressFk, vAgencyModeFk, vShipped)
 		GROUP BY c.id;
 
 	DROP TEMPORARY TABLE tmp.zoneNodes;