diff --git a/submodules/devices/devices.js b/submodules/devices/devices.js
index 52dd56c..39033a5 100644
--- a/submodules/devices/devices.js
+++ b/submodules/devices/devices.js
@@ -1031,11 +1031,18 @@ define(function(require) {
 						.mapValues('data')
 						.value()
 				},
-				mergedDevice = _.merge(
+				deviceData = _.mergeWith(
 					{},
 					deviceDefaults,
 					deviceDefaultsForType,
 					data.device,
+					function(dest, src) {
+						return _.every([dest, src], _.isArray) ? src : undefined;
+					}
+				),
+				mergedDevice = _.assign(
+					{},
+					deviceData,
 					deviceOverrides
 				);