diff --git a/submodules/devices/devices.js b/submodules/devices/devices.js
index 2fb87f4..a46c7b2 100644
--- a/submodules/devices/devices.js
+++ b/submodules/devices/devices.js
@@ -324,14 +324,16 @@ define(function(require) {
 					var section = '.tabs-section[data-section="' + value.type + '"] ';
 
 					_.each(value.data, function(val, key) {
-						var groupSelector = '.control-group[data-id="' + key + '"] ',
-							valueSelector = '.feature-key-value[data-type="' + val.type + '"]';
-
-						templateDevice
-							.find(section.concat(groupSelector, valueSelector))
-								.addClass('active')
-							.find('[name="provision.keys.' + value.id + '[' + key + '].value"]')
-								.val(val.value);
+						if (val) {
+							var groupSelector = '.control-group[data-id="' + key + '"] ',
+								valueSelector = '.feature-key-value[data-type="' + val.type + '"]';
+
+							templateDevice
+								.find(section.concat(groupSelector, valueSelector))
+									.addClass('active')
+								.find('[name="provision.keys.' + value.id + '[' + key + '].value"]')
+									.val(val.value);
+						}
 					});
 				});
 
@@ -665,9 +667,7 @@ define(function(require) {
 					var keys = {};
 
 					list[key].forEach(function(val, idx) {
-						if (val.type !== 'none') {
-							keys[idx] = val;
-						}
+						keys[idx] = val.type === 'none' ? null : val;
 					});
 
 					if (_.isEmpty(keys)) {
diff --git a/views/devices-sip_device.html b/views/devices-sip_device.html
index 17c8787..7308062 100644
--- a/views/devices-sip_device.html
+++ b/views/devices-sip_device.html
@@ -347,12 +347,6 @@
 							<label for="provision.keys.{{../id}}[{{@key}}].value">{{ @root.i18n.devices.popupSettings.keys.labels.value }}</label>
 							<input type="text" value="" name="provision.keys.{{../id}}[{{@key}}].value">
 						</div>
-					{{#compare id '===' 'combo_keys'}}
-						{{#compare @key '===' '0'}}
-							{{#if @root.extra.firstComboKeyUnset}}
-							{{/if}}
-						{{/compare}}
-					{{/compare}}
 					</div>
 				</div>
 				{{/each}}