diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/rows/calendar/components/EventCardCalendarEvent.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/rows/calendar/components/EventCardCalendarEvent.tsx
index 378c65d9a53..bc14ea8f7be 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/rows/calendar/components/EventCardCalendarEvent.tsx
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/rows/calendar/components/EventCardCalendarEvent.tsx
@@ -8,9 +8,8 @@ import { type CalendarEvent } from '@/activities/calendar/types/CalendarEvent';
 import { useOpenCalendarEventInSidePanel } from '@/side-panel/hooks/useOpenCalendarEventInSidePanel';
 import { CoreObjectNameSingular } from 'twenty-shared/types';
 import { useFindOneRecord } from '@/object-record/hooks/useFindOneRecord';
-import { useUpsertRecordsInStore } from '@/object-record/record-store/hooks/useUpsertRecordsInStore';
 import { UserContext } from '@/users/contexts/UserContext';
-import { useContext, useEffect } from 'react';
+import { useContext } from 'react';
 import { FIELD_RESTRICTED_ADDITIONAL_PERMISSIONS_REQUIRED } from 'twenty-shared/constants';
 import { CombinedGraphQLErrors } from '@apollo/client/errors';
 import { isDefined } from 'twenty-shared/utils';
@@ -97,7 +96,6 @@ export const EventCardCalendarEvent = ({
 }: {
   calendarEventId: string;
 }) => {
-  const { upsertRecordsInStore } = useUpsertRecordsInStore();
   const { openCalendarEventInSidePanel } = useOpenCalendarEventInSidePanel();
 
   const {
@@ -121,12 +119,6 @@ export const EventCardCalendarEvent = ({
     },
   });
 
-  useEffect(() => {
-    if (calendarEvent) {
-      upsertRecordsInStore({ partialRecords: [calendarEvent] });
-    }
-  }, [calendarEvent, upsertRecordsInStore]);
-
   const { timeZone } = useContext(UserContext);
 
   if (isDefined(error)) {
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/rows/message/components/EventCardMessage.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/rows/message/components/EventCardMessage.tsx
index 52083730df6..0ceb363ccb6 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/rows/message/components/EventCardMessage.tsx
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/rows/message/components/EventCardMessage.tsx
@@ -6,9 +6,7 @@ import { EventCardMessageForbidden } from '@/activities/timeline-activities/rows
 import { useOpenEmailThreadInSidePanel } from '@/side-panel/hooks/useOpenEmailThreadInSidePanel';
 import { CoreObjectNameSingular } from 'twenty-shared/types';
 import { useFindOneRecord } from '@/object-record/hooks/useFindOneRecord';
-import { useUpsertRecordsInStore } from '@/object-record/record-store/hooks/useUpsertRecordsInStore';
 import { Trans, useLingui } from '@lingui/react/macro';
-import { useEffect } from 'react';
 import { FIELD_RESTRICTED_ADDITIONAL_PERMISSIONS_REQUIRED } from 'twenty-shared/constants';
 import { CombinedGraphQLErrors } from '@apollo/client/errors';
 import { isDefined } from 'twenty-shared/utils';
@@ -63,7 +61,6 @@ export const EventCardMessage = ({
   authorFullName: string;
 }) => {
   const { t } = useLingui();
-  const { upsertRecordsInStore } = useUpsertRecordsInStore();
   const { openEmailThreadInSidePanel } = useOpenEmailThreadInSidePanel();
 
   const {
@@ -85,12 +82,6 @@ export const EventCardMessage = ({
     },
   });
 
-  useEffect(() => {
-    if (message) {
-      upsertRecordsInStore({ partialRecords: [message] });
-    }
-  }, [message, upsertRecordsInStore]);
-
   if (isDefined(error)) {
     if (CombinedGraphQLErrors.is(error)) {
       const shouldHideMessageContent = error.errors.some(
diff --git a/packages/twenty-front/src/modules/ai/hooks/useAgentChatData.ts b/packages/twenty-front/src/modules/ai/hooks/useAgentChatData.ts
index 6bab6fde539..c7e5a19a65b 100644
--- a/packages/twenty-front/src/modules/ai/hooks/useAgentChatData.ts
+++ b/packages/twenty-front/src/modules/ai/hooks/useAgentChatData.ts
@@ -144,6 +144,7 @@ export const useAgentChatData = () => {
     },
   );
 
+  // TODO: Refactor this useEffect to avoid unnecessary re-renders (see PR #18584 review)
   useEffect(() => {
     if (!threadsData) return;
 
@@ -204,6 +205,7 @@ export const useAgentChatData = () => {
     skip: !isDefined(currentAIChatThread) || isNewThread,
   });
 
+  // TODO: Refactor this useEffect to avoid unnecessary re-renders (see PR #18584 review)
   useEffect(() => {
     if (data) {
       store.set(skipMessagesSkeletonUntilLoadedState.atom, false);
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useWorkspaceFromInviteHash.ts b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useWorkspaceFromInviteHash.ts
index 64728107d3c..ab94d6dffea 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useWorkspaceFromInviteHash.ts
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useWorkspaceFromInviteHash.ts
@@ -37,6 +37,7 @@ export const useWorkspaceFromInviteHash = () => {
     }
   }, [error, enqueueErrorSnackBar, navigate]);
 
+  // TODO: Rework this useEffect - Charles will refactor as part of auth rework
   useEffect(() => {
     if (!workspaceFromInviteHash || hasRedirected) return;
 
diff --git a/packages/twenty-front/src/modules/domain-manager/hooks/useGetPublicWorkspaceDataByDomain.ts b/packages/twenty-front/src/modules/domain-manager/hooks/useGetPublicWorkspaceDataByDomain.ts
index f9e363a606c..25664633814 100644
--- a/packages/twenty-front/src/modules/domain-manager/hooks/useGetPublicWorkspaceDataByDomain.ts
+++ b/packages/twenty-front/src/modules/domain-manager/hooks/useGetPublicWorkspaceDataByDomain.ts
@@ -44,6 +44,7 @@ export const useGetPublicWorkspaceDataByDomain = () => {
     },
   );
 
+  // TODO: Refactor these useEffects to avoid unnecessary re-renders (see PR #18584 review)
   useEffect(() => {
     if (data) {
       setWorkspaceAuthProviders(
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useCreateManyRecords.ts b/packages/twenty-front/src/modules/object-record/hooks/useCreateManyRecords.ts
index a9842cf6bb8..5fd639305cc 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/useCreateManyRecords.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/useCreateManyRecords.ts
@@ -20,6 +20,7 @@ import { useUpsertRecordsInStore } from '@/object-record/record-store/hooks/useU
 import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
 import { computeOptimisticRecordFromInput } from '@/object-record/utils/computeOptimisticRecordFromInput';
 import { dispatchObjectRecordOperationBrowserEvent } from '@/browser-event/utils/dispatchObjectRecordOperationBrowserEvent';
+import { type RecordGqlNode } from '@/object-record/graphql/types/RecordGqlNode';
 import { getCreateManyRecordsMutationResponseField } from '@/object-record/utils/getCreateManyRecordsMutationResponseField';
 import { sanitizeRecordInput } from '@/object-record/utils/sanitizeRecordInput';
 import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
@@ -195,7 +196,7 @@ export const useCreateManyRecords = <
           },
         },
         update: (cache, { data }) => {
-          const records = (data as Record<string, any>)?.[
+          const records = (data as Record<string, RecordGqlNode[]> | null)?.[
             mutationResponseField
           ];
 
@@ -254,8 +255,9 @@ export const useCreateManyRecords = <
     });
 
     return (
-      (createdObjects.data as Record<string, any>)?.[mutationResponseField] ??
-      []
+      (createdObjects.data as Record<string, RecordGqlNode[]> | null)?.[
+        mutationResponseField
+      ] ?? []
     );
   };
 
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useFindManyRecords.ts b/packages/twenty-front/src/modules/object-record/hooks/useFindManyRecords.ts
index 00ca2829bb9..cad25751701 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/useFindManyRecords.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/useFindManyRecords.ts
@@ -103,6 +103,7 @@ export const useFindManyRecords = <T extends ObjectRecord = ObjectRecord>({
       client: apolloCoreClient,
     });
 
+  // TODO: Refactor these useEffects to avoid unnecessary re-renders (see PR #18584 review)
   useEffect(() => {
     if (data) {
       handleFindManyRecordsCompleted(data);
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useLazyFindOneRecord.ts b/packages/twenty-front/src/modules/object-record/hooks/useLazyFindOneRecord.ts
index 40891f2050b..c1e11746e11 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/useLazyFindOneRecord.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/useLazyFindOneRecord.ts
@@ -5,6 +5,7 @@ import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient
 import { type ObjectMetadataItemIdentifier } from '@/object-metadata/types/ObjectMetadataItemIdentifier';
 import { getRecordFromRecordNode } from '@/object-record/cache/utils/getRecordFromRecordNode';
 import { useGenerateDepthRecordGqlFieldsFromObject } from '@/object-record/graphql/record-gql-fields/hooks/useGenerateDepthRecordGqlFieldsFromObject';
+import { type RecordGqlNode } from '@/object-record/graphql/types/RecordGqlNode';
 import { type RecordGqlOperationGqlRecordFields } from 'twenty-shared/types';
 import { useFindOneRecordQuery } from '@/object-record/hooks/useFindOneRecordQuery';
 import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
@@ -58,7 +59,9 @@ export const useLazyFindOneRecord = <T extends ObjectRecord = ObjectRecord>({
       }).retain();
       if (result.data) {
         const record = getRecordFromRecordNode<T>({
-          recordNode: (result.data as Record<string, any>)[objectNameSingular],
+          recordNode: (result.data as Record<string, RecordGqlNode>)[
+            objectNameSingular
+          ],
         });
         onCompleted?.(record);
       }
@@ -66,6 +69,9 @@ export const useLazyFindOneRecord = <T extends ObjectRecord = ObjectRecord>({
     called,
     error,
     loading,
-    record: (data as Record<string, any>)?.[objectNameSingular] || undefined,
+    record:
+      (data as Record<string, RecordGqlNode> | undefined)?.[
+        objectNameSingular
+      ] || undefined,
   };
 };
diff --git a/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/hooks/useSingleRecordPickerPerformSearch.ts b/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/hooks/useSingleRecordPickerPerformSearch.ts
index 25511a2956b..c317aaf8b46 100644
--- a/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/hooks/useSingleRecordPickerPerformSearch.ts
+++ b/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/hooks/useSingleRecordPickerPerformSearch.ts
@@ -72,6 +72,7 @@ export const useSingleRecordPickerPerformSearch = ({
     [selectedRecords, filteredSelectedRecords, recordsToSelect],
   );
 
+  // TODO: Refactor this useEffect to avoid unnecessary re-renders (see PR #18584 review)
   useEffect(() => {
     allSearchRecords.forEach((searchRecord) => {
       store.set(
diff --git a/packages/twenty-front/src/modules/users/hooks/useLoadCurrentUser.ts b/packages/twenty-front/src/modules/users/hooks/useLoadCurrentUser.ts
index 03f4130c86d..cae3362a2e1 100644
--- a/packages/twenty-front/src/modules/users/hooks/useLoadCurrentUser.ts
+++ b/packages/twenty-front/src/modules/users/hooks/useLoadCurrentUser.ts
@@ -55,10 +55,12 @@ export const useLoadCurrentUser = () => {
       fetchPolicy: 'network-only',
     });
 
-    const coreViewsResult = await client.query({
-      query: FindAllCoreViewsDocument,
-      fetchPolicy: 'network-only',
-    });
+    const coreViewsResult = isOnAWorkspace
+      ? await client.query({
+          query: FindAllCoreViewsDocument,
+          fetchPolicy: 'network-only',
+        })
+      : undefined;
 
     if (isDefined(currentUserResult.error)) {
       throw new Error(currentUserResult.error.message);
@@ -137,7 +139,7 @@ export const useLoadCurrentUser = () => {
       });
     }
 
-    if (isDefined(coreViewsResult.data?.getCoreViews)) {
+    if (isDefined(coreViewsResult?.data?.getCoreViews)) {
       setCoreViews(coreViewsResult.data.getCoreViews);
     }
 
diff --git a/packages/twenty-front/src/pages/settings/ai/SettingsAgentTurnDetail.tsx b/packages/twenty-front/src/pages/settings/ai/SettingsAgentTurnDetail.tsx
index a3e93061982..118992728ad 100644
--- a/packages/twenty-front/src/pages/settings/ai/SettingsAgentTurnDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/SettingsAgentTurnDetail.tsx
@@ -16,7 +16,10 @@ import { getSettingsPath } from 'twenty-shared/utils';
 import { H2Title, Status } from 'twenty-ui/display';
 import { Section } from 'twenty-ui/layout';
 import { themeCssVariables } from 'twenty-ui/theme-constants';
-import { GetAgentTurnsDocument } from '~/generated-metadata/graphql';
+import {
+  type AgentMessage,
+  GetAgentTurnsDocument,
+} from '~/generated-metadata/graphql';
 
 const StyledTableContainer = styled.div`
   margin-top: ${themeCssVariables.spacing[3]};
@@ -61,7 +64,7 @@ export const SettingsAgentTurnDetail = () => {
     skip: !agentId,
   });
 
-  const turn = data?.agentTurns?.find((t: any) => t.id === turnId);
+  const turn = data?.agentTurns?.find((t) => t.id === turnId);
 
   const getScoreColor = (score: number) => {
     if (score >= 80) return 'green';
@@ -147,9 +150,9 @@ export const SettingsAgentTurnDetail = () => {
           {turn.messages.length > 0 ? (
             <StyledMessagesContainer>
               {mapDBMessagesToUIMessages(
-                ([...turn.messages] as any[])
-                  .filter((msg: any) => msg.parts && msg.parts.length > 0)
-                  .sort((a: any, b: any) => {
+                ([...turn.messages] as AgentMessage[])
+                  .filter((msg) => msg.parts.length > 0)
+                  .sort((a, b) => {
                     if (a.role === 'user' && b.role === 'assistant') return -1;
                     if (a.role === 'assistant' && b.role === 'user') return 1;
                     return (
@@ -196,11 +199,11 @@ export const SettingsAgentTurnDetail = () => {
                 </StyledTableHeaderRowContainer>
                 {[...turn.evaluations]
                   .sort(
-                    (a: any, b: any) =>
+                    (a, b) =>
                       new Date(b.createdAt).getTime() -
                       new Date(a.createdAt).getTime(),
                   )
-                  .map((evaluation: any) => (
+                  .map((evaluation) => (
                     <TableRow
                       key={evaluation.id}
                       gridTemplateColumns="140px 80px 1fr"