diff --git a/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/Filter.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/Filter.java
index 272e9ba8a3c..88f7e90a0a8 100644
--- a/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/Filter.java
+++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/Filter.java
@@ -118,6 +118,11 @@ public class Filter {
      */
     private boolean isNotRetired;
 
+    /**
+     * To check whether web applications should be returned
+     */
+    private boolean withWebApps;
+
     public int getLimit() {
         return limit;
     }
@@ -221,4 +226,12 @@ public class Filter {
     public void setNotRetired(boolean notRetired) {
         isNotRetired = notRetired;
     }
+
+    public boolean isWithWebApps() {
+        return withWebApps;
+    }
+
+    public void setWithWebApps(boolean withWebApps) {
+        this.withWebApps = withWebApps;
+    }
 }
diff --git a/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/application/GenericApplicationDAOImpl.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/application/GenericApplicationDAOImpl.java
index 7c71880fa6d..618149cd722 100644
--- a/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/application/GenericApplicationDAOImpl.java
+++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/application/GenericApplicationDAOImpl.java
@@ -178,7 +178,11 @@ public class GenericApplicationDAOImpl extends AbstractDAOImpl implements Applic
             sql += "AND AP_APP_RELEASE.CURRENT_STATE = ? ";
         }
         if (deviceTypeId != -1) {
-            sql += "AND AP_APP.DEVICE_TYPE_ID = ? ";
+            sql += "AND (AP_APP.DEVICE_TYPE_ID = ? ";
+            if (filter.isWithWebApps()) {
+                sql += "OR AP_APP.DEVICE_TYPE_ID = 0 ";
+            }
+            sql += ") ";
         }
         if (filter.isNotRetired()) {
             sql +=  "AND AP_APP.STATUS != 'RETIRED' ";
@@ -309,7 +313,11 @@ public class GenericApplicationDAOImpl extends AbstractDAOImpl implements Applic
             sql += " AND AP_APP_RELEASE.CURRENT_STATE = ?";
         }
         if (deviceTypeId != -1) {
-            sql += " AND AP_APP.DEVICE_TYPE_ID = ?";
+            sql += "AND (AP_APP.DEVICE_TYPE_ID = ? ";
+            if (filter.isWithWebApps()) {
+                sql += "OR AP_APP.DEVICE_TYPE_ID = 0 ";
+            }
+            sql += ") ";
         }
         if (filter.isNotRetired()) {
             sql +=  " AND AP_APP.STATUS != 'RETIRED'";