diff --git a/components/extensions/appm-connector/org.wso2.carbon.appmgt.mdm.osgiconnector/src/main/java/org/wso2/carbon/appmgt/mdm/osgiconnector/ApplicationOperationsImpl.java b/components/extensions/appm-connector/org.wso2.carbon.appmgt.mdm.osgiconnector/src/main/java/org/wso2/carbon/appmgt/mdm/osgiconnector/ApplicationOperationsImpl.java
index 25dbe4242..5977deeb3 100644
--- a/components/extensions/appm-connector/org.wso2.carbon.appmgt.mdm.osgiconnector/src/main/java/org/wso2/carbon/appmgt/mdm/osgiconnector/ApplicationOperationsImpl.java
+++ b/components/extensions/appm-connector/org.wso2.carbon.appmgt.mdm.osgiconnector/src/main/java/org/wso2/carbon/appmgt/mdm/osgiconnector/ApplicationOperationsImpl.java
@@ -109,8 +109,13 @@ public class ApplicationOperationsImpl implements ApplicationOperations {
                             .getDeviceManagementService(applicationOperationAction.getTenantId()).
                                     getAllDevicesOfRole(userRole);
                     for (org.wso2.carbon.device.mgt.common.Device device : deviceList) {
-                        if (MDMAppConstants.ACTIVE.equalsIgnoreCase(device.getEnrolmentInfo().getStatus().toString())) {
-                            deviceIdentifiers.add(getDeviceIdentifierByDevice(device));
+                        if (MDMAppConstants.WEBAPP.equals(applicationOperationAction.getApp().getPlatform())
+                                || applicationOperationAction.getApp().getPlatform()
+                                .equalsIgnoreCase(device.getType())) {
+                            if (MDMAppConstants.ACTIVE
+                                    .equalsIgnoreCase(device.getEnrolmentInfo().getStatus().toString())) {
+                                deviceIdentifiers.add(getDeviceIdentifierByDevice(device));
+                            }
                         }
                     }
                 }