diff --git a/chatdesk-ui/app/[locale]/login/page.tsx b/chatdesk-ui/app/[locale]/login/page.tsx
index b51bfaa..ec78f7e 100644
--- a/chatdesk-ui/app/[locale]/login/page.tsx
+++ b/chatdesk-ui/app/[locale]/login/page.tsx
@@ -74,8 +74,8 @@ export default async function Login({
     // Since we used `.limit(1)`, we can safely use `.single()` now
     const workspace = homeWorkspace[0]; // Use the first (and only) row
 
-
-    return redirect(`/${localeString}/${homeWorkspace.id}/chat`)
+    return redirect(`/${localeString}/${workspace.id}/chat`)
+    //return redirect(`/${localeString}/${homeWorkspace.id}/chat`)
 
   }
 
@@ -128,7 +128,8 @@ export default async function Login({
       )
     }
 
-    return redirect(`/${localeString}/${homeWorkspace.id}/chat`)
+    return redirect(`/${localeString}/${workspace.id}/chat`)
+    //return redirect(`/${localeString}/${homeWorkspace.id}/chat`)
   }
 
   const getEnvVarOrEdgeConfigValue = async (name: string) => {