diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index 8ef23fd3..57c28919 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -45,11 +45,7 @@ const App = (): JSX.Element => {
         <ThemeProvider theme={theme}>
           <AppContextProvider settings={settings} setSettings={setSettings}>
             <CssBaseline />
-            {window.NativeRobosats === undefined ? (
-              <UnsafeAlert settings={settings} setSettings={setSettings} />
-            ) : (
-              <TorConnectionBadge />
-            )}
+            {window.NativeRobosats === undefined ? <UnsafeAlert /> : <TorConnectionBadge />}
             <Main />
           </AppContextProvider>
         </ThemeProvider>
diff --git a/frontend/src/models/Garage.model.ts b/frontend/src/models/Garage.model.ts
index 712747d5..c9af8480 100644
--- a/frontend/src/models/Garage.model.ts
+++ b/frontend/src/models/Garage.model.ts
@@ -10,13 +10,14 @@ const emptySlot: Slot = { robot: new Robot(), order: null };
 
 class Garage {
   constructor(initialState?: Garage) {
-    if (initialState?.slots === undefined && systemClient.getItem('garage') != '') {
-      this.slots = JSON.parse(systemClient.getItem('garage'));
+    const slotsDump: string | undefined = systemClient.getItem('garage');
+    if (initialState?.slots === undefined && slotsDump != '') {
+      this.slots = JSON.parse(slotsDump);
       console.log('Robot Garage was loaded from local storage');
     } else {
       this.slots = [emptySlot];
     }
-    this.setGarage = initialState?.setGarage != null || (() => {});
+    this.setGarage = initialState?.setGarage || (() => {});
   }
 
   slots: Slot[] = [emptySlot];
diff --git a/mobile/App.tsx b/mobile/App.tsx
index bc80029e..ac1387e9 100644
--- a/mobile/App.tsx
+++ b/mobile/App.tsx
@@ -45,13 +45,11 @@ const App = () => {
 
     EncryptedStorage.removeItem('sessionid');
     EncryptedStorage.removeItem('csrftoken');
-    loadCookie('robot_token');
-    loadCookie('pub_key');
     loadCookie('settings_fontsize_basic');
     loadCookie('settings_language');
     loadCookie('settings_mode');
     loadCookie('settings_network');
-    loadCookie('enc_priv_key').then(() => injectMessageResolve(reponseId));
+    loadCookie('garage').then(() => injectMessageResolve(reponseId));
   };
 
   const onMessage = async (event: WebViewMessageEvent) => {