diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/status/task/impl/DeviceStatusMonitoringTask.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/status/task/impl/DeviceStatusMonitoringTask.java
index a873c2f60e7..99e0bd0c3ee 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/status/task/impl/DeviceStatusMonitoringTask.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/status/task/impl/DeviceStatusMonitoringTask.java
@@ -116,8 +116,7 @@ public class DeviceStatusMonitoringTask extends DynamicPartitionedScheduleTask {
                     DeviceIdentifier deviceIdentifier =
                             new DeviceIdentifier(monitoringData.getDevice()
                                     .getDeviceIdentifier(), deviceType);
-                    DeviceCacheManagerImpl.getInstance().removeDeviceFromCache(deviceIdentifier,
-                            monitoringData.getTenantId());
+                    monitoringData.getDevice().setEnrolmentInfo(enrolmentInfo);
                     DeviceCacheManagerImpl.getInstance().addDeviceToCache(deviceIdentifier,
                             monitoringData.getDevice(), monitoringData.getTenantId());
                 }