diff --git a/packages/twenty-front/src/modules/settings/admin-panel/ai/components/SettingsAdminAI.tsx b/packages/twenty-front/src/modules/settings/admin-panel/ai/components/SettingsAdminAI.tsx
index c8e57fba0a9..7be739943b2 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/ai/components/SettingsAdminAI.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/ai/components/SettingsAdminAI.tsx
@@ -1,5 +1,4 @@
 import { useMemo, useState } from 'react';
-import { useNavigate } from 'react-router-dom';
 
 import { useMutation, useQuery } from '@apollo/client/react';
 import { t } from '@lingui/core/macro';
@@ -54,7 +53,6 @@ type UsageBreakdownItem = {
 };
 
 export const SettingsAdminAI = () => {
-  const navigate = useNavigate();
   const { enqueueErrorSnackBar } = useSnackBar();
   const { refetch: refetchClientConfig } = useClientConfig();
   const { formatUsageValue } = useUsageValueFormatter();
@@ -323,14 +321,9 @@ export const SettingsAdminAI = () => {
                 <TableRow
                   key={item.key}
                   gridTemplateColumns={USAGE_TABLE_GRID_TEMPLATE_COLUMNS}
-                  onClick={() =>
-                    navigate(
-                      getSettingsPath(
-                        SettingsPath.AdminPanelWorkspaceDetail,
-                        { workspaceId: item.key },
-                      ),
-                    )
-                  }
+                  to={getSettingsPath(SettingsPath.AdminPanelWorkspaceDetail, {
+                    workspaceId: item.key,
+                  })}
                 >
                   <TableCell color={themeCssVariables.font.color.primary}>
                     {item.label ?? item.key}
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminGeneral.tsx b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminGeneral.tsx
index dfd8292fb4e..74a86e9846c 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminGeneral.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminGeneral.tsx
@@ -111,7 +111,7 @@ export const SettingsAdminGeneral = () => {
                   <TableRow gridTemplateColumns="1fr 2fr 1fr">
                     <TableHeader>{t`Name`}</TableHeader>
                     <TableHeader>{t`Email`}</TableHeader>
-                    <TableHeader>{t`Workspace`}</TableHeader>
+                    <TableHeader align="right">{t`Workspace`}</TableHeader>
                   </TableRow>
                   {recentUsers.map((user) => (
                     <TableRow
@@ -126,7 +126,9 @@ export const SettingsAdminGeneral = () => {
                           '\u2014'}
                       </TableCell>
                       <TableCell>{user.email}</TableCell>
-                      <TableCell>{user.workspaceName || '\u2014'}</TableCell>
+                      <TableCell align="right">
+                        {user.workspaceName || '\u2014'}
+                      </TableCell>
                     </TableRow>
                   ))}
                 </TableBody>
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/graphql/queries/getAdminChatThreadMessages.ts b/packages/twenty-front/src/modules/settings/admin-panel/graphql/queries/getAdminChatThreadMessages.ts
index b7d2918edb3..9433c747b5d 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/graphql/queries/getAdminChatThreadMessages.ts
+++ b/packages/twenty-front/src/modules/settings/admin-panel/graphql/queries/getAdminChatThreadMessages.ts
@@ -1,14 +1,8 @@
 import { gql } from '@apollo/client';
 
 export const GET_ADMIN_CHAT_THREAD_MESSAGES = gql`
-  query GetAdminChatThreadMessages(
-    $workspaceId: String!
-    $threadId: String!
-  ) {
-    getAdminChatThreadMessages(
-      workspaceId: $workspaceId
-      threadId: $threadId
-    ) {
+  query GetAdminChatThreadMessages($workspaceId: String!, $threadId: String!) {
+    getAdminChatThreadMessages(workspaceId: $workspaceId, threadId: $threadId) {
       thread {
         id
         title
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminWorkspaceChatThread.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminWorkspaceChatThread.tsx
index 0a5318d3c29..58d130ab405 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminWorkspaceChatThread.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminWorkspaceChatThread.tsx
@@ -132,10 +132,7 @@ export const SettingsAdminWorkspaceChatThread = () => {
     >
       <SettingsPageContainer>
         <Section>
-          <H2Title
-            title={threadTitle}
-            description={t`Chat conversation`}
-          />
+          <H2Title title={threadTitle} description={t`Chat conversation`} />
 
           {messages.length === 0 ? (
             <Card rounded>
@@ -151,16 +148,13 @@ export const SettingsAdminWorkspaceChatThread = () => {
           ) : (
             <StyledMessagesContainer>
               {messages
-                .filter(
-                  (message) => message.role !== AgentMessageRole.SYSTEM,
-                )
+                .filter((message) => message.role !== AgentMessageRole.SYSTEM)
                 .map((message) => {
                   const isUser = message.role === AgentMessageRole.USER;
                   const textParts = message.parts
                     .filter(
                       (part) =>
-                        part.type === 'text' &&
-                        part.textContent !== null,
+                        part.type === 'text' && part.textContent !== null,
                     )
                     .map((part) => part.textContent)
                     .join('\n');
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminWorkspaceDetail.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminWorkspaceDetail.tsx
index d163661ce4d..f1d772348d8 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminWorkspaceDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminWorkspaceDetail.tsx
@@ -1,4 +1,4 @@
-import { useMemo, useState } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 import { useParams } from 'react-router-dom';
 
 import { useMutation, useQuery } from '@apollo/client/react';
@@ -19,6 +19,7 @@ import { useImpersonationRedirect } from '@/settings/admin-panel/hooks/useImpers
 import { userLookupResultState } from '@/settings/admin-panel/states/userLookupResultState';
 import { type AdminChatThread } from '@/settings/admin-panel/types/AdminChatThread';
 import { type UserLookup } from '@/settings/admin-panel/types/UserLookup';
+import { type WorkspaceInfo } from '@/settings/admin-panel/types/WorkspaceInfo';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
 import { SettingsSkeletonLoader } from '@/settings/components/SettingsSkeletonLoader';
 import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
@@ -61,7 +62,6 @@ const WORKSPACE_DETAIL_TAB_IDS = {
 
 export const SettingsAdminWorkspaceDetail = () => {
   const { workspaceId } = useParams<{ workspaceId: string }>();
-  const navigate = useNavigate();
 
   const [activeTabId] = useAtomComponentState(
     activeTabIdComponentState,
@@ -89,14 +89,16 @@ export const SettingsAdminWorkspaceDetail = () => {
   }>(WORKSPACE_LOOKUP_ADMIN_PANEL, {
     variables: { workspaceId },
     skip: !workspaceId,
-    onCompleted: (data) => {
-      if (isDefined(data?.workspaceLookupAdminPanel)) {
-        setUserLookupResult(data.workspaceLookupAdminPanel);
-      }
-    },
   });
 
-  const workspace = workspaceData?.workspaceLookupAdminPanel?.workspaces?.[0];
+  useEffect(() => {
+    if (isDefined(workspaceData?.workspaceLookupAdminPanel)) {
+      setUserLookupResult(workspaceData.workspaceLookupAdminPanel);
+    }
+  }, [workspaceData, setUserLookupResult]);
+
+  const workspace = workspaceData?.workspaceLookupAdminPanel
+    ?.workspaces?.[0] as WorkspaceInfo | undefined;
 
   const effectiveTabId = activeTabId || WORKSPACE_DETAIL_TAB_IDS.INFO;