diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceTaskManagerServiceComponent.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceTaskManagerServiceComponent.java
index 28a0a2345db..7051d72f51c 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceTaskManagerServiceComponent.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceTaskManagerServiceComponent.java
@@ -72,8 +72,8 @@ public class DeviceTaskManagerServiceComponent {
     @SuppressWarnings("unused")
     protected void deactivate(ComponentContext componentContext) {
         try {
-            DeviceTaskManagerService taskManagerService = new DeviceTaskManagerServiceImpl();
-            taskManagerService.stopTask();
+//            DeviceTaskManagerService taskManagerService = new DeviceTaskManagerServiceImpl();
+//            taskManagerService.stopTask();
         } catch (Throwable e) {
             log.error("Error occurred while destroying the device details retrieving task manager service.", e);
         }