diff --git a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/mgt/impl/MonitoringManagerImpl.java b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/mgt/impl/MonitoringManagerImpl.java
index e2acdb0884..030043a1e9 100644
--- a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/mgt/impl/MonitoringManagerImpl.java
+++ b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/mgt/impl/MonitoringManagerImpl.java
@@ -304,8 +304,9 @@ public class MonitoringManagerImpl implements MonitoringManager {
 
             if (!deviceIdsWithExistingOperation.isEmpty()) {
                 monitoringDAO.updateAttempts(new ArrayList<>(deviceIdsWithExistingOperation.keySet()), false);
-                decisionPoint.setDevicesAsUnreachable(this.getDeviceIdentifiersFromDevices(
-                        new ArrayList<>(deviceIdsWithExistingOperation.values())));
+                //TODO uncomment with proper fix
+//                decisionPoint.setDevicesAsUnreachable(this.getDeviceIdentifiersFromDevices(
+//                        new ArrayList<>(deviceIdsWithExistingOperation.values())));
             }
 
             PolicyManagementDAOFactory.commitTransaction();