diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/AbstractDeviceDAOImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/AbstractDeviceDAOImpl.java
index f241691ff6a..f6b42189ebb 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/AbstractDeviceDAOImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/AbstractDeviceDAOImpl.java
@@ -295,7 +295,7 @@ public abstract class AbstractDeviceDAOImpl implements DeviceDAO {
         Connection conn = null;
         PreparedStatement stmt = null;
         ResultSet resultSet = null;
-        List<Device> devices = null;
+        List<Device> devices = new ArrayList<>();
         try {
             List<List<String>> outputLists = new ArrayList<>();
             List<String> deviceList = null;