diff --git a/db/routines/vn/functions/address_hasDelivery.sql b/db/routines/vn/functions/address_hasDelivery.sql
new file mode 100644
index 000000000..f37edbd34
--- /dev/null
+++ b/db/routines/vn/functions/address_hasDelivery.sql
@@ -0,0 +1,24 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`address_hasDelivery`(vSelf INT, vLanded DATE)
+	RETURNS BOOL
+	DETERMINISTIC
+BEGIN
+/**
+ * Retorna si hay reparto disponible para
+ * la dirección y fecha solicitada.
+ *
+ * @param vSelf Id de dirección de envío
+ * @param vLanded Fecha de entrega
+ * @return true|false
+ */
+	DECLARE vHasDelivery BOOL;
+
+	CALL zone_getAgency(vSelf, vLanded);
+
+	SELECT EXISTS (SELECT TRUE FROM tmp.zoneGetAgency) INTO vHasDelivery;
+
+	RETURN vHasDelivery;
+
+	DROP TEMPORARY TABLE tmp.zoneGetAgency;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/procedures/zone_getAddresses.sql b/db/routines/vn/procedures/zone_getAddresses.sql
index 2e5982c82..0e52abe1c 100644
--- a/db/routines/vn/procedures/zone_getAddresses.sql
+++ b/db/routines/vn/procedures/zone_getAddresses.sql
@@ -21,6 +21,7 @@ BEGIN
 		SELECT clientFk
 			FROM vn.ticket
 			WHERE shipped BETWEEN vShipped AND util.dayEnd(vShipped)
+				AND NOT isDeleted
 	)
 	SELECT c.id,
 			c.name,
@@ -50,7 +51,8 @@ BEGIN
 			AND c.isActive
 			AND ct.code = 'normal'
 			AND bt.code <> 'worker'
-			AND (d.id = vDepartmentFk OR NOT vDepartmentFk)
+			AND (d.id = vDepartmentFk OR vDepartmentFk IS NULL)
+			AND vn.address_hasDelivery(c.defaultAddressFk, vShipped)
 		GROUP BY c.id;
 
 	DROP TEMPORARY TABLE tmp.zoneNodes;