diff --git a/src/fireedge/src/client/components/HOC/AuthLayout.js b/src/fireedge/src/client/components/HOC/AuthLayout.js
index c95f7e97a1..b283079de2 100644
--- a/src/fireedge/src/client/components/HOC/AuthLayout.js
+++ b/src/fireedge/src/client/components/HOC/AuthLayout.js
@@ -69,7 +69,7 @@ const AuthLayout = ({ subscriptions = [], children }) => {
 
   useEffect(() => {
     if (!jwt) {
-      const token = findStorageData(JWT_NAME) || findExternalToken()
+      const token = findExternalToken() || findStorageData(JWT_NAME)
       token && changeJwt(token) && storage(JWT_NAME, token)
     }