diff --git a/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/devicetypes/android.xml b/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/devicetypes/android.xml
index 961aa1c9b..ed43a7911 100644
--- a/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/devicetypes/android.xml
+++ b/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/devicetypes/android.xml
@@ -369,15 +369,15 @@
         <Frequency> - The time interval (in seconds) in which the task should run for this device-type
         <IdleTimeToMarkInactive> - The time duration (in seconds) in which the device can be moved to inactive status
                                    which means the device will be moved to inactive status if that device does not
-                                   contact the server within that time period.
+                                   contact the server within that time period. Better to have a multiplier of Frequency.
         <IdleTimeToMarkUnreachable> - The time duration (in seconds) in which the device can be moved to unreachable status
                                       which means the device will be moved to unreachable status if that device does not
-                                      contact the server within that time period.
+                                      contact the server within that time period. Better to have a multiplier of Frequency.
     -->
     <DeviceStatusTaskConfig>
         <RequireStatusMonitoring>true</RequireStatusMonitoring>
         <Frequency>300</Frequency>
-        <IdleTimeToMarkInactive>600</IdleTimeToMarkInactive>
-        <IdleTimeToMarkUnreachable>300</IdleTimeToMarkUnreachable>
+        <IdleTimeToMarkInactive>900</IdleTimeToMarkInactive>
+        <IdleTimeToMarkUnreachable>600</IdleTimeToMarkUnreachable>
     </DeviceStatusTaskConfig>
 </DeviceTypeConfiguration>
\ No newline at end of file
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/devicetypes/windows.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/devicetypes/windows.xml
index 420c80495..7ccd06a96 100644
--- a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/devicetypes/windows.xml
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/devicetypes/windows.xml
@@ -179,7 +179,7 @@
     <DeviceStatusTaskConfig>
         <RequireStatusMonitoring>true</RequireStatusMonitoring>
         <Frequency>300</Frequency>
-        <IdleTimeToMarkInactive>600</IdleTimeToMarkInactive>
-        <IdleTimeToMarkUnreachable>300</IdleTimeToMarkUnreachable>
+        <IdleTimeToMarkInactive>900</IdleTimeToMarkInactive>
+        <IdleTimeToMarkUnreachable>600</IdleTimeToMarkUnreachable>
     </DeviceStatusTaskConfig>
 </DeviceTypeConfiguration>