diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/AbstractGroupDAOImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/AbstractGroupDAOImpl.java
index f535138521..7584b5fea7 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/AbstractGroupDAOImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/AbstractGroupDAOImpl.java
@@ -73,10 +73,10 @@ public abstract class AbstractGroupDAOImpl implements GroupDAO {
             String sql = "SELECT ID, DESCRIPTION, GROUP_NAME, OWNER, STATUS, PARENT_PATH FROM DM_GROUP "
                     + "WHERE TENANT_ID = ?";
             if (StringUtils.isNotBlank(request.getGroupName())) {
-                sql += " AND UPPER(GROUP_NAME) LIKE ?";
+                sql += " AND GROUP_NAME LIKE ?";
             }
             if (StringUtils.isNotBlank(request.getOwner())) {
-                sql += " AND UPPER(OWNER) LIKE ?";
+                sql += " AND OWNER LIKE ?";
             }
             if (StringUtils.isNotBlank(request.getStatus())) {
                 sql += " AND STATUS = ?";