diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/OptionField.php b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/OptionField.php
index c44283eb3..907f81323 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/OptionField.php
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/OptionField.php
@@ -45,11 +45,7 @@ class OptionField extends BaseListField
             // copy options to internal structure, make sure we don't copy in array structures
             foreach ($data as $key => $value) {
                 if (!is_array($value)) {
-                    if ($key === "__empty__") {
-                        $this->internalOptionList[""] = gettext($value);
-                    } else {
-                        $this->internalOptionList[$key] = gettext($value);
-                    }
+                    $this->internalOptionList[$key] = gettext($value);
                 }
             }
         }
diff --git a/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml b/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml
index 34a2965de..b5b9a0951 100644
--- a/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml
@@ -1,9 +1,7 @@
 <model>
     <mount>//OPNsense/TrafficShaper</mount>
     <version>1.0.3</version>
-    <description>
-        OPNsense traffic shaper
-    </description>
+    <description>OPNsense traffic shaper</description>
     <items>
         <pipes>
             <pipe type="ArrayField">
@@ -56,7 +54,6 @@
                 </buckets>
                 <scheduler type="OptionField">
                     <Required>N</Required>
-                    <default></default>
                     <BlankDesc>Weighted Fair Queueing</BlankDesc>
                     <OptionValues>
                         <fifo>FIFO</fifo>
@@ -251,7 +248,6 @@
                 </interface>
                 <interface2 type="InterfaceField">
                     <Required>N</Required>
-                    <default></default>
                     <AllowDynamic>Y</AllowDynamic>
                     <filters>
                         <enable>/^(?!0).*$/</enable>
@@ -343,9 +339,8 @@
                 </dscp>
                 <direction type="OptionField">
                     <Required>N</Required>
-                    <default></default>
+                    <BlankDesc>both</BlankDesc>
                     <OptionValues>
-                        <__empty__>both</__empty__>
                         <in>in</in>
                         <out>out</out>
                     </OptionValues>