diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/mdm/mobileservices/windows/common/util/DeviceUtil.java b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/mdm/mobileservices/windows/common/util/DeviceUtil.java
index 5f1c90b1b..e014cdcb1 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/mdm/mobileservices/windows/common/util/DeviceUtil.java
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/mdm/mobileservices/windows/common/util/DeviceUtil.java
@@ -54,7 +54,7 @@ public class DeviceUtil {
         if (deviceID != null) {
             cacheEntry.setDeviceID(deviceID);
         }
-        getTokenCache().put(token, cacheEntry);
+        getTokenCache().put(token.trim(), cacheEntry);
     }
 
     public static void removeToken(String token) {