diff --git a/packages/twenty-front/src/modules/databases/hooks/useCreateOneDatabaseConnection.ts b/packages/twenty-front/src/modules/databases/hooks/useCreateOneDatabaseConnection.ts
index 3221c305c77a..8155f348def3 100644
--- a/packages/twenty-front/src/modules/databases/hooks/useCreateOneDatabaseConnection.ts
+++ b/packages/twenty-front/src/modules/databases/hooks/useCreateOneDatabaseConnection.ts
@@ -1,5 +1,4 @@
 import { ApolloClient, useMutation } from '@apollo/client';
-import { getOperationName } from '@apollo/client/utilities';
 
 import { CREATE_ONE_DATABASE_CONNECTION } from '@/databases/graphql/mutations/createOneDatabaseConnection';
 import { GET_MANY_DATABASE_CONNECTIONS } from '@/databases/graphql/queries/findManyDatabaseConnections';
@@ -9,6 +8,7 @@ import {
   CreateServerMutation,
   CreateServerMutationVariables,
 } from '~/generated-metadata/graphql';
+import { isDefined } from '~/utils/isDefined';
 
 export const useCreateOneDatabaseConnection = () => {
   const apolloMetadataClient = useApolloMetadataClient();
@@ -27,8 +27,28 @@ export const useCreateOneDatabaseConnection = () => {
       variables: {
         input,
       },
-      awaitRefetchQueries: true,
-      refetchQueries: [getOperationName(GET_MANY_DATABASE_CONNECTIONS) ?? ''],
+      update: (cache, { data }) => {
+        const createdRemoteServer = data?.createOneRemoteServer;
+        if (!createdRemoteServer) return;
+
+        const getManyDatabaseConnectionsQuery = {
+          query: GET_MANY_DATABASE_CONNECTIONS,
+          variables: {
+            input: { foreignDataWrapperType: input.foreignDataWrapperType },
+          },
+        };
+
+        if (isDefined(cache.readQuery(getManyDatabaseConnectionsQuery))) {
+          cache.updateQuery(getManyDatabaseConnectionsQuery, (cachedQuery) => ({
+            findManyRemoteServersByType: [
+              ...cachedQuery.findManyRemoteServersByType,
+              createdRemoteServer,
+            ],
+          }));
+
+          return;
+        }
+      },
     });
   };