diff --git a/javascript/src/iframe/viamapi-iframe.js b/javascript/src/iframe/viamapi-iframe.js
index 438d893b88fa18048d5174bc46f9bd2ad50e231b..958679bc7f57f7ca7eb43cbfae850a220b3d5f28 100644
--- a/javascript/src/iframe/viamapi-iframe.js
+++ b/javascript/src/iframe/viamapi-iframe.js
@@ -1362,7 +1362,8 @@ function executeRestfulFunction(type, that, fn, ...args) {
       fn.apply(that, args).then((response) => {
         if (response.data.code == "400" && response.data.status == "Bad session") {
           console.log("Trying to login again")
-          if(currentlyAuthenticatedIdentity != "" && currentlyAuthenticatedIdentity != null) {
+          if (currentlyAuthenticatedIdentity != "" && currentlyAuthenticatedIdentity != null
+            && localStorage.getItem("didLogout") != "true") {
             viamApi.identityLogin("previousaddeddevice").then((response1) => {
               if (response1.data.code == "200") {
                 //console.log(response.data.data)
@@ -1384,7 +1385,8 @@ function executeRestfulFunction(type, that, fn, ...args) {
               }
             });
           } else {
-            if(currentlyLoadedIdentity != "" && currentlyLoadedIdentity != null) {
+            if (currentlyLoadedIdentity != "" && currentlyLoadedIdentity != null &&
+              localStorage.getItem("didLogout") != "true") {
               viamApi.identityLogin("previousaddeddevice").then((response1) => {
                 if (response1.data.code == "200") {
                   //console.log(response.data.data)
@@ -1727,6 +1729,7 @@ const connection = Penpal.connectToParent({
                 localStorage.setItem("token", token)
                 localStorage.setItem("authenticatedIdentity",
                   loginIdentity.authentication.publicKey)
+                localStorage.removeItem("didLogout")
                 setKeyForUUID(uuid, loginIdentity.authentication.publicKey)
                 currentlyAuthenticatedIdentity = loadedIdentities[loginIdentity.authentication.publicKey]
                 lastTimeGetProfile = 0;
@@ -1754,6 +1757,7 @@ const connection = Penpal.connectToParent({
                 localStorage.setItem("token", token)
                 localStorage.setItem("authenticatedIdentity",
                   loginIdentity.authentication.publicKey)
+                localStorage.removeItem("didLogout")
                 setKeyForUUID(uuid, loginIdentity.authentication.publicKey)
                 currentlyAuthenticatedIdentity = loadedIdentities[loginIdentity.authentication.publicKey]
                 lastTimeGetProfile = 0;
@@ -1893,6 +1897,7 @@ const connection = Penpal.connectToParent({
           localStorage.removeItem("uuid")
           localStorage.removeItem("token")
           localStorage.removeItem("authenticatedIdentity")
+          localStorage.setItem("didLogout", "true")
           delete loadedIdentities[authenticationPublicKey]
           //console.log("Set loaded identity in logout")
           currentlyLoadedIdentity = null