diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/BaseModel.php b/src/opnsense/mvc/app/models/OPNsense/Base/BaseModel.php
index 26daf64d2..57497ce1e 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Base/BaseModel.php
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/BaseModel.php
@@ -241,7 +241,7 @@ abstract class BaseModel
                 }
                 if ($config_data != null && isset($config_data->$tagName)) {
                     // set field content from config (if available)
-                    $fieldObject->setValue((string)$config_data->$tagName);
+                    $fieldObject->setValue($config_data->$tagName);
                 }
             } else {
                 // add new child node container, always try to pass config data
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 2be14b91b..75f5cd4c5 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/BaseField.php
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/BaseField.php
@@ -365,15 +365,15 @@ abstract class BaseField
 
     /**
      * default setter
-     * @param string $value set field value
+     * @param SimpleXMLElement|string $value set field value
      */
     public function setValue($value)
     {
         // if first set and not altered by the user, store initial value
         if ($this->internalFieldLoaded === false && $this->internalInitialValue === false) {
-            $this->internalInitialValue = $value;
+            $this->internalInitialValue = (string)$value;
         }
-        $this->internalValue = $value;
+        $this->internalValue = (string)$value;
         // apply filters, may be extended later.
         $filters = array('applyFilterChangeCase');
         foreach ($filters as $filter) {
diff --git a/src/opnsense/mvc/app/models/OPNsense/Interfaces/FieldTypes/LinkAddressField.php b/src/opnsense/mvc/app/models/OPNsense/Interfaces/FieldTypes/LinkAddressField.php
index 8c055d244..85b12195e 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Interfaces/FieldTypes/LinkAddressField.php
+++ b/src/opnsense/mvc/app/models/OPNsense/Interfaces/FieldTypes/LinkAddressField.php
@@ -138,6 +138,7 @@ class LinkAddressField extends BaseField
      */
     public function setValue($value)
     {
+        $value = (string)$value;
         $parent = $this->getParentNode();
         if (Util::isIpAddress($value)) {
             $parent->ipaddr = $value;