diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/BaseModel.php b/src/opnsense/mvc/app/models/OPNsense/Base/BaseModel.php
index 95dd37299..8740dbb13 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Base/BaseModel.php
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/BaseModel.php
@@ -97,7 +97,7 @@ abstract class BaseModel
             $result = array();
             foreach ($xmlNode->children() as $childNode) {
                 // item keys can be overwritten using value attributes
-                if (empty($childNode->attributes()['value'])) {
+                if (!isset($childNode->attributes()['value'])) {
                     $itemKey = (string)$childNode->getName();
                 } else {
                     $itemKey = (string)$childNode->attributes()['value'];
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 d4db62c36..421031d46 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/OptionField.php
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/OptionField.php
@@ -84,7 +84,7 @@ class OptionField extends BaseField
             // 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__") {
+                    if ($key === "__empty__") {
                         $this->internalOptionList[""] = $value;
                     } else {
                         $this->internalOptionList[$key] = $value;