components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dao/impl/device/GenericDeviceDAOImpl.java

@@ -1268,8 +1268,7 @@ public class GenericDeviceDAOImpl extends AbstractDeviceDAOImpl {
             boolean isOwnershipProvided = false;
             boolean isSerialProvided = false;
 
-            StringJoiner joiner = new StringJoiner(",",
-                    "SELECT "
+            query = "SELECT "
                     + "DM_DEVICE.ID AS DEVICE_ID, "
                     + "DM_DEVICE.NAME AS DEVICE_NAME, "
                     + "DM_DEVICE.DESCRIPTION AS DESCRIPTION, "
@@ -1288,13 +1287,17 @@ public class GenericDeviceDAOImpl extends AbstractDeviceDAOImpl {
                     + "DM_DEVICE.ID = e.DEVICE_ID AND "
                     + "DM_DEVICE.TENANT_ID = e.TENANT_ID "
                     + "INNER JOIN (SELECT ID, NAME FROM DM_DEVICE_TYPE) AS device_types ON "
-                            + "device_types.ID = DM_DEVICE.DEVICE_TYPE_ID "
-                            + "INNER JOIN DM_DEVICE_INFO i ON "
+                    + "device_types.ID = DM_DEVICE.DEVICE_TYPE_ID ";
+
+            if (null != serial && !serial.isEmpty()) { // Only if serial is provided, join with device info table
+                query = query.concat("INNER JOIN DM_DEVICE_INFO i ON "
                         + "DM_DEVICE.ID = i.DEVICE_ID "
-                            + "AND i.KEY_FIELD = 'serial' "
-                            + "WHERE DM_DEVICE.ID IN (",
+                        + "AND i.KEY_FIELD = 'serial' ");
+                isSerialProvided = true;
+            }
+            query = query.concat("WHERE DM_DEVICE.ID IN (");
+            StringJoiner joiner = new StringJoiner(",", query ,
                     ") AND DM_DEVICE.TENANT_ID = ? AND e.STATUS != ?");
-
             deviceIds.stream().map(ignored -> "?").forEach(joiner::add);
             query = joiner.toString();
 
@@ -1306,9 +1309,8 @@ public class GenericDeviceDAOImpl extends AbstractDeviceDAOImpl {
                 query += " AND e.OWNERSHIP = ?";
                 isOwnershipProvided = true;
             }
-            if (serial != null && !serial.isEmpty()) {
+            if (isSerialProvided) {
                 query += " AND i.VALUE_FIELD LIKE ?" ;
-                isSerialProvided = true;
             }
             if (user != null && !user.isEmpty()) {
                 query += " AND e.OWNER = ?";