diff --git a/app/provision/resources/classes/provision.php b/app/provision/resources/classes/provision.php
index 696a6ec6e7..131c4ef8ba 100644
--- a/app/provision/resources/classes/provision.php
+++ b/app/provision/resources/classes/provision.php
@@ -946,18 +946,34 @@ include "root.php";
 						if (is_array($device_keys)) {
 							foreach($device_keys as $k => $field) {
 								if (strlen($field['device_key_uuid']) > 0) {
-										$device_keys[$k]['device_key_value'] = str_replace("\${".$name."}", $value, $field['device_key_value']);
-										$device_keys[$k]['device_key_extension'] = str_replace("\${".$name."}", $value, $field['device_key_extension']);
-										$device_keys[$k]['device_key_label'] = str_replace("\${".$name."}", $value, $field['device_key_label']);
-										$device_keys[$k]['device_key_icon'] = str_replace("\${".$name."}", $value, $field['device_key_icon']);
+										if (isset($field['device_key_value'])) {
+											$device_keys[$k]['device_key_value'] = str_replace("\${".$name."}", $value, $field['device_key_value']);
+										}
+										if (isset($field['device_key_extension'])) {
+											$device_keys[$k]['device_key_extension'] = str_replace("\${".$name."}", $value, $field['device_key_extension']);
+										}
+										if (isset($field['device_key_label'])) {
+											$device_keys[$k]['device_key_label'] = str_replace("\${".$name."}", $value, $field['device_key_label']);
+										}
+										if (isset($field['device_key_icon'])) {
+											$device_keys[$k]['device_key_icon'] = str_replace("\${".$name."}", $value, $field['device_key_icon']);
+										}
 								}
 								else {
 									if (is_array($field)) {
 										foreach($field as $key => $row) {
-											$device_keys[$k][$key]['device_key_value'] = str_replace("\${".$name."}", $value, $row['device_key_value']);
-											$device_keys[$k][$key]['device_key_extension'] = str_replace("\${".$name."}", $value, $row['device_key_extension']);
-											$device_keys[$k][$key]['device_key_label'] = str_replace("\${".$name."}", $value, $row['device_key_label']);
-											$device_keys[$k][$key]['device_key_icon'] = str_replace("\${".$name."}", $value, $row['device_key_icon']);
+											if (isset($row['device_key_value'])) {
+												$device_keys[$k][$key]['device_key_value'] = str_replace("\${".$name."}", $value, $row['device_key_value']);
+											}
+											if (isset($row['device_key_extension'])) {
+												$device_keys[$k][$key]['device_key_extension'] = str_replace("\${".$name."}", $value, $row['device_key_extension']);
+											}
+											if (isset($row['device_key_label'])) {
+												$device_keys[$k][$key]['device_key_label'] = str_replace("\${".$name."}", $value, $row['device_key_label']);
+											}
+											if (isset($row['device_key_icon'])) {
+												$device_keys[$k][$key]['device_key_icon'] = str_replace("\${".$name."}", $value, $row['device_key_icon']);
+											}
 										}
 									}
 								}