diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/BaseField.php b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/BaseField.php
index defc628ae..8432a4ce5 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/BaseField.php
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/BaseField.php
@@ -376,7 +376,11 @@ abstract class BaseField
      */
     public function setAttributeValue($key, $value)
     {
-        $this->internalAttributes[$key] = $value;
+        if ($value !== null) {
+            $this->internalAttributes[$key] = $value;
+        } elseif (isset($this->internalAttributes[$key])) {
+            unset($this->internalAttributes[$key]);
+        }
     }
 
     /**