diff --git a/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.php b/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.php
index 9a5b19df5..863aaa91d 100644
--- a/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.php
+++ b/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.php
@@ -56,6 +56,8 @@ class TrafficShaper extends BaseModel
                         $currentval *= 1000;
                     } elseif ($parentNode->bandwidthMetric == "Mbit") {
                         $currentval *= 1000000;
+                    } elseif ($parentNode->bandwidthMetric == "Gbit") {
+                        $currentval *= 1000000000;
                     }
                     if ($currentval > $max_bandwith) {
                         $messages->appendMessage(new Message(
diff --git a/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml b/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml
index 36484d5e5..86619e849 100644
--- a/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml
@@ -30,6 +30,7 @@
                         <bit>bit/s</bit>
                         <Kbit>kbit/s</Kbit>
                         <Mbit>Mbit/s</Mbit>
+                        <Gbit>Gbit/s</Mbit>
                     </OptionValues>
                     <ValidationMessage>Bandwidth metric should be either bit/s, kbit/s or Mbit/s</ValidationMessage>
                 </bandwidthMetric>