diff --git a/src/app/App.tsx b/src/app/App.tsx
index c3cd0cc9..b52b26f0 100644
--- a/src/app/App.tsx
+++ b/src/app/App.tsx
@@ -73,11 +73,11 @@ function App() {
         const accounts_list = localStorage.getItem('accountsList');
         const client_accounts = localStorage.getItem('clientAccounts');
         const active_loginid =
-            JSON.parse(Cookies.get('active_loginid') || '') || localStorage.getItem('active_loginid');
+            JSON.parse(Cookies.get('active_loginid') || '{}') || localStorage.getItem('active_loginid');
         console.log('test from app', {
             active_loginid,
-            active_login_id_encrypted: JSON.parse(Cookies.get('active_login_id_unencrypted') || ''),
-            active_loginid_cookie: Cookies.get('active_loginid') || '',
+            active_login_id_encrypted: JSON.parse(Cookies.get('active_loginid') || '{}'),
+            active_loginid_cookie: Cookies.get('active_loginid') || '{}',
             active_loginid_local_storage: localStorage.getItem('active_loginid'),
         });
         const url_params = new URLSearchParams(window.location.search);
diff --git a/src/pages/callback/callback-page.tsx b/src/pages/callback/callback-page.tsx
index 065b263d..4ae08e67 100644
--- a/src/pages/callback/callback-page.tsx
+++ b/src/pages/callback/callback-page.tsx
@@ -51,7 +51,7 @@ const CallbackPage = () => {
                 }
                 if (!is_token_set) {
                     const active_loginid =
-                        JSON.parse(Cookies.get('active_loginid') || '') || localStorage.getItem('active_loginid');
+                        JSON.parse(Cookies.get('active_loginid') || '{}') || localStorage.getItem('active_loginid');
                     console.log('test from callback', {
                         tokens,
                         active_loginid,