diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/device.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/device.js
index 26233a32d8..25cccf8c57 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/device.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/device.js
@@ -118,13 +118,18 @@ deviceModule = function () {
                             if (properties["DEVICE_INFO"]) {
                                 var initialDeviceInfoList = parse(properties["DEVICE_INFO"]);
                                 var initialDeviceInfo = {};
-                                for (var j = 0; j < initialDeviceInfoList.length; j++) {
-                                    if (initialDeviceInfoList[j]["value"]) {
-                                        initialDeviceInfo[initialDeviceInfoList[j]["name"]] =
-                                            initialDeviceInfoList[j]["value"];
+                                if (Array.isArray(initialDeviceInfoList) {
+                                    for (var j = 0; j < initialDeviceInfoList.length; j++) {
+                                        if (initialDeviceInfoList[j]["value"]) {
+                                            initialDeviceInfo[initialDeviceInfoList[j]["name"]] =
+                                                initialDeviceInfoList[j]["value"];
+                                        }
                                     }
+                                } else {
+                                    initialDeviceInfo = initialDeviceInfoList;
                                 }
 
+
                                 filteredDeviceData["initialDeviceInfo"]["DEVICE_INFO"] = initialDeviceInfo;
                             }
                         }