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 7974f0b40..5f4f62ff1 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/BaseField.php
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/BaseField.php
@@ -250,7 +250,7 @@ abstract class BaseField
     public function setValue($value)
     {
         // if first set, store initial value
-        if ($this->internalInitialValue === false) {
+        if ($this->internalInitialValue === false && !empty($value)) {
             $this->internalInitialValue = $value;
         }
         $this->internalValue = $value;