diff --git a/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml b/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml
index 2333bb264..24d6491cb 100644
--- a/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml
@@ -14,7 +14,8 @@
                 </number>
                 <bandwidth type="IntegerField">
                     <Required>Y</Required>
-                    <default>899795</default>
+                    <MinimumValue>1</MinimumValue>
+                    <MaximumValue>899795</MaximumValue>
                 </bandwidth>
                 <bandwidthMetric type="OptionField">
                     <Required>Y</Required>
@@ -28,8 +29,6 @@
                 </bandwidthMetric>
                 <queue type="IntegerField">
                     <Required>N</Required>
-                    <MinimumValue>1</MinimumValue>
-                    <MaximumValue>100</MaximumValue>
                 </queue>
                 <queueMetric type="OptionField">
                     <Required>N</Required>
diff --git a/src/opnsense/service/templates/OPNsense/IPFW/ipfw.conf b/src/opnsense/service/templates/OPNsense/IPFW/ipfw.conf
index e753eb023..fecace885 100644
--- a/src/opnsense/service/templates/OPNsense/IPFW/ipfw.conf
+++ b/src/opnsense/service/templates/OPNsense/IPFW/ipfw.conf
@@ -27,8 +27,13 @@ flush
 #======================================================================================
 # define dummynet pipes
 #======================================================================================
-{% if helpers.exists('OPNsense.TrafficShaper.pipe') %}
+{% if helpers.exists('OPNsense.TrafficShaper.pipes.pipe') %}
+{% for pipe in OPNsense.TrafficShaper.pipes.pipe %}
+ipfw pipe {{ pipe.number }} config bw {{ pipe.bandwidth }}{{ pipe.bandwidthMetric }}/s {%
+ if pipe.queue %} queue {{ pipe.queue }} {%
+ if pipe.queueMetric != 'slots' %} {{pipe.queueMetric}}  {% endif %}  {% endif %}
 
+{% endfor %}
 {% endif %}
 
 #======================================================================================