diff --git a/src/opnsense/service/templates/OPNsense/IPFW/ipfw.conf b/src/opnsense/service/templates/OPNsense/IPFW/ipfw.conf
index 7d8e1c729..9104f29f2 100644
--- a/src/opnsense/service/templates/OPNsense/IPFW/ipfw.conf
+++ b/src/opnsense/service/templates/OPNsense/IPFW/ipfw.conf
@@ -44,7 +44,9 @@ pipe {{ pipe.number }} config bw {{ pipe.bandwidth }}{{ pipe.bandwidthMetric }}/
 #======================================================================================
 {% if helpers.exists('OPNsense.TrafficShaper.queues.queue') %}
 {% for queue in helpers.toList('OPNsense.TrafficShaper.queues.queue') %}
-queue {{ queue.number }} config pipe {{ queue.pipe }} weight {{ queue.weight }}
+{%    if helpers.getUUIDtag(queue.pipe) in ['pipe'] %}
+queue {{ queue.number }} config pipe {{ helpers.getUUID(queue.pipe).number }} weight {{ queue.weight }}
+{%    endif %}
 {% endfor %}
 {% endif %}