diff --git a/src/common/auth/token_storage.js b/src/common/auth/token_storage.js
index e894f55bb8..17ba919821 100644
--- a/src/common/auth/token_storage.js
+++ b/src/common/auth/token_storage.js
@@ -10,7 +10,7 @@ if (!tokenCache) {
 }
 
 export function askWrite() {
-  return tokenCache.writeEnabled === undefined;
+  return tokenCache.tokens !== undefined && tokenCache.writeEnabled === undefined;
 }
 
 export function storeTokens(tokens) {