diff --git a/packages/twenty-front/src/modules/apollo/components/ApolloProvider.tsx b/packages/twenty-front/src/modules/apollo/components/ApolloProvider.tsx
index b263900a6..a14a5e9f6 100644
--- a/packages/twenty-front/src/modules/apollo/components/ApolloProvider.tsx
+++ b/packages/twenty-front/src/modules/apollo/components/ApolloProvider.tsx
@@ -12,7 +12,7 @@ export const ApolloProvider = ({ children }: React.PropsWithChildren) => {
 
   const apolloClient = useApolloFactory({
     uri: `${REACT_APP_SERVER_BASE_URL}/metadata`,
-    connectToDevTools: true,
+    connectToDevTools: true, // should this be default , ie dependant on IS_DEBUG_MODE?
     extraLinks: [captchaRefreshLink],
   });
 
diff --git a/packages/twenty-front/src/modules/object-metadata/components/ApolloCoreProvider.tsx b/packages/twenty-front/src/modules/object-metadata/components/ApolloCoreProvider.tsx
index d616697ef..0b210d235 100644
--- a/packages/twenty-front/src/modules/object-metadata/components/ApolloCoreProvider.tsx
+++ b/packages/twenty-front/src/modules/object-metadata/components/ApolloCoreProvider.tsx
@@ -1,5 +1,4 @@
 import { useApolloFactory } from '@/apollo/hooks/useApolloFactory';
-import { REACT_APP_SERVER_BASE_URL } from '~/config';
 
 import { ApolloCoreClientContext } from '../contexts/ApolloCoreClientContext';
 
@@ -8,10 +7,7 @@ export const ApolloCoreProvider = ({
 }: {
   children: React.ReactNode;
 }) => {
-  const apolloCoreClient = useApolloFactory({
-    uri: `${REACT_APP_SERVER_BASE_URL}/graphql`,
-    connectToDevTools: true, // @Felix I am not sure if this is correct, should be false?
-  });
+  const apolloCoreClient = useApolloFactory();
 
   return (
     <ApolloCoreClientContext.Provider value={apolloCoreClient}>
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useFetchMoreRecordsWithPagination.ts b/packages/twenty-front/src/modules/object-record/hooks/useFetchMoreRecordsWithPagination.ts
index 47401f65a..9cf3d8207 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/useFetchMoreRecordsWithPagination.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/useFetchMoreRecordsWithPagination.ts
@@ -24,7 +24,6 @@ import { OnFindManyRecordsCompleted } from '@/object-record/types/OnFindManyReco
 import { filterUniqueRecordEdgesByCursor } from '@/object-record/utils/filterUniqueRecordEdgesByCursor';
 import { getQueryIdentifier } from '@/object-record/utils/getQueryIdentifier';
 
-import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
 import { capitalize, isDefined } from 'twenty-shared/utils';
 import { cursorFamilyState } from '../states/cursorFamilyState';
 import { hasNextPageFamilyState } from '../states/hasNextPageFamilyState';
@@ -77,8 +76,6 @@ export const useFetchMoreRecordsWithPagination = <
   objectMetadataItem,
   onCompleted,
 }: UseFindManyRecordsStateParams<T>) => {
-  const apolloCoreClient = useApolloCoreClient();
-
   const queryIdentifier = getQueryIdentifier({
     objectNameSingular,
     filter,
@@ -124,14 +121,12 @@ export const useFetchMoreRecordsWithPagination = <
                 lastCursor: isNonEmptyString(lastCursorLocal)
                   ? lastCursorLocal
                   : undefined,
-                client: apolloCoreClient,
               },
               updateQuery: (prev, { fetchMoreResult }) => {
                 const previousEdges =
                   prev?.[objectMetadataItem.namePlural]?.edges;
                 const nextEdges =
                   fetchMoreResult?.[objectMetadataItem.namePlural]?.edges;
-
                 let newEdges: RecordGqlEdge[] = previousEdges ?? [];
 
                 if (isNonEmptyArray(nextEdges)) {
@@ -207,7 +202,6 @@ export const useFetchMoreRecordsWithPagination = <
       onCompleted,
       handleFindManyRecordsError,
       queryIdentifier,
-      apolloCoreClient,
     ],
   );