diff --git a/src/services/userService.ts b/src/services/userService.ts
index e6d8a3bb8..c813e97ef 100644
--- a/src/services/userService.ts
+++ b/src/services/userService.ts
@@ -140,15 +140,19 @@ export const isTokenValid = async () => {
                 'X-Auth-Token': getToken(),
             }
         );
-        if (!resp?.data?.hasSetKeys) {
-            try {
-                putAttributes(
-                    getToken(),
-                    getData(LS_KEYS.ORIGINAL_KEY_ATTRIBUTES)
-                );
-            } catch (e) {
-                logError(e, 'put attribute failed');
+        try {
+            if (!resp.data['hasSetKeys']) {
+                try {
+                    await putAttributes(
+                        getToken(),
+                        getData(LS_KEYS.ORIGINAL_KEY_ATTRIBUTES)
+                    );
+                } catch (e) {
+                    logError(e, 'put attribute failed');
+                }
             }
+        } catch (e) {
+            logError(e, 'hasSetKeys not set in session validity response');
         }
         return true;
     } catch (e) {