diff --git a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dao/impl/ApplicationDAOImpl.java b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dao/impl/ApplicationDAOImpl.java
index 8aa49c92e0..4f46d5b4f6 100644
--- a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dao/impl/ApplicationDAOImpl.java
+++ b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dao/impl/ApplicationDAOImpl.java
@@ -293,11 +293,11 @@ public class ApplicationDAOImpl implements ApplicationDAO {
                         "WHERE A.NAME = DM_APPLICATION.NAME " +
                         "AND A.ID < DM_APPLICATION.ID) " +
                     "AND PLATFORM = ? " +
-                    "AND TENANT_ID = ?";
+                    "AND TENANT_ID = ? ";
         try {
             String filter = request.getFilter();
             if (filter != null) {
-                sql = sql + "AND NAME LIKE ?";
+                sql = sql + "AND NAME LIKE ? ";
             }
             sql = sql + "LIMIT ? OFFSET ?";
             Connection conn = this.getConnection();