diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/template/DeviceTypeManagerService.java b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/template/DeviceTypeManagerService.java
index 347782bf5ff..c7720093a66 100644
--- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/template/DeviceTypeManagerService.java
+++ b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/template/DeviceTypeManagerService.java
@@ -154,7 +154,7 @@ public class DeviceTypeManagerService implements DeviceManagementService {
 
     @Override
     public PolicyMonitoringManager getPolicyMonitoringManager() {
-        return null;
+        return policyMonitoringManager;
     }
 
     private void setProvisioningConfig(String tenantDomain, DeviceTypeConfiguration deviceTypeConfiguration) {
diff --git a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/task/MonitoringTask.java b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/task/MonitoringTask.java
index 965d61a9e34..eb28b9e7d8e 100644
--- a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/task/MonitoringTask.java
+++ b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/task/MonitoringTask.java
@@ -135,8 +135,11 @@ public class MonitoringTask implements Task {
      */
 
     private boolean isPlatformExist(String deviceType) {
-        PolicyConfiguration policyConfiguration =
-                DeviceConfigurationManager.getInstance().getDeviceManagementConfig().getPolicyConfiguration();
-        return (policyConfiguration.getPlatforms().contains(deviceType));
+        PolicyMonitoringManager policyMonitoringManager = PolicyManagementDataHolder.getInstance()
+                .getDeviceManagementService().getPolicyMonitoringManager(deviceType);
+        if (policyMonitoringManager != null) {
+            return true;
+        }
+        return false;
     }
 }