diff --git a/dockers/docker-dhcp-relay/wait_for_intf.sh.j2 b/dockers/docker-dhcp-relay/wait_for_intf.sh.j2
index bf50abe4f0..fd7c3ff95b 100644
--- a/dockers/docker-dhcp-relay/wait_for_intf.sh.j2
+++ b/dockers/docker-dhcp-relay/wait_for_intf.sh.j2
@@ -29,12 +29,19 @@ function wait_until_iface_ready
 
 
 # Wait for all interfaces to be up and ready
-{% for (name, prefix) in INTERFACE|pfx_filter %}
+{% for name in PORT %}
+{% if name in INTERFACE %}
 wait_until_iface_ready ${PORT_TABLE_PREFIX} {{ name }}
+{% endif %}
 {% endfor %}
-{% for (name, prefix) in VLAN_INTERFACE|pfx_filter %}
+{% for name in VLAN %}
+{% if name in VLAN_INTERFACE %}
 wait_until_iface_ready ${VLAN_TABLE_PREFIX} {{ name }}
+{% endif %}
 {% endfor %}
-{% for (name, prefix) in PORTCHANNEL_INTERFACE|pfx_filter %}
+{% for name in PORTCHANNEL %}
+{% if name in PORTCHANNEL_INTERFACE %}
 wait_until_iface_ready ${LAG_TABLE_PREFIX} {{ name }}
+{% endif %}
 {% endfor %}
+