diff --git a/src/opnsense/mvc/app/controllers/OPNsense/TrafficShaper/forms/dialogPipe.xml b/src/opnsense/mvc/app/controllers/OPNsense/TrafficShaper/forms/dialogPipe.xml
index 9e0859b7c..a492fd15c 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/TrafficShaper/forms/dialogPipe.xml
+++ b/src/opnsense/mvc/app/controllers/OPNsense/TrafficShaper/forms/dialogPipe.xml
@@ -88,6 +88,13 @@
         <advanced>true</advanced>
         <help>The number of flow queues that are created and managed, leave empty for defaults</help>
     </field>
+    <field>
+        <id>pipe.delay</id>
+        <label>Delay</label>
+        <type>text</type>
+        <advanced>true</advanced>
+        <help>Add delay in ms to this pipe.</help>
+    </field>
     <field>
         <id>pipe.description</id>
         <label>description</label>
diff --git a/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml b/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml
index 77ebeedcd..c00e56008 100644
--- a/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml
@@ -97,6 +97,12 @@
                     <mask>/^([a-z,A-Z,1-9]){0,30}$/</mask>
                     <ValidationMessage>Origin should be regular text of max 30 characters</ValidationMessage>
                 </origin>
+                <delay type="IntegerField">
+                    <Required>N</Required>
+                    <MinimumValue>1</MinimumValue>
+                    <MaximumValue>3000</MaximumValue>
+                    <ValidationMessage>Please choose a value between 1 and 3000</ValidationMessage>
+                </delay>
                 <description type="TextField">
                     <Required>Y</Required>
                     <mask>/^([\t\n\v\f\r 0-9a-zA-Z.\-,_\x{00A0}-\x{FFFF}]){1,255}$/u</mask>
diff --git a/src/opnsense/service/templates/OPNsense/IPFW/ipfw.conf b/src/opnsense/service/templates/OPNsense/IPFW/ipfw.conf
index 24f916f78..f86de6d69 100644
--- a/src/opnsense/service/templates/OPNsense/IPFW/ipfw.conf
+++ b/src/opnsense/service/templates/OPNsense/IPFW/ipfw.conf
@@ -41,6 +41,7 @@ pipe {{ pipe.number }} config bw {{ pipe.bandwidth }}{{ pipe.bandwidthMetric }}/
  if pipe.queueMetric != 'slots' %}{{pipe.queueMetric}}{% endif %}{% endif
  %}{% if pipe.mask != 'none' %} mask {{ pipe.mask }} 0xffffffff {% endif %} type {%
  if pipe.scheduler|default('') != '' %} {{pipe.scheduler}} {% else %} wf2q+ {% endif %}{%
+ if pipe.delay|default('') != '' %} delay {{pipe.delay}} {% endif %}{%
  if pipe.codel_enable|default('0') == '1' and pipe.scheduler != 'fq_codel' %} codel {% endif %}{%
  if pipe.codel_enable|default('0') == '1' or pipe.scheduler == 'fq_codel' %}{%
      if pipe.codel_target|default('') != ''%} target {{pipe.codel_target}} {% endif %}{%