diff --git a/packages/web/src/graphql/client.ts b/packages/web/src/graphql/client.ts
index 920c8358..1b76faba 100644
--- a/packages/web/src/graphql/client.ts
+++ b/packages/web/src/graphql/client.ts
@@ -10,7 +10,12 @@ type CreateClientOptions = {
 
 const client = new ApolloClient({
   cache,
-  link: createLink({ uri: appConfig.graphqlUrl })
+  link: createLink({ uri: appConfig.graphqlUrl }),
+  defaultOptions: {
+    watchQuery: {
+      fetchPolicy: 'cache-and-network',
+    }
+  }
 });
 
 export function mutateAndGetClient(options: CreateClientOptions): typeof client {
diff --git a/packages/web/src/hooks/useCurrentUser.ts b/packages/web/src/hooks/useCurrentUser.ts
index 40f9287c..cb193056 100644
--- a/packages/web/src/hooks/useCurrentUser.ts
+++ b/packages/web/src/hooks/useCurrentUser.ts
@@ -4,7 +4,7 @@ import { IUser } from '@automatisch/types';
 import { GET_CURRENT_USER } from 'graphql/queries/get-current-user';
 
 export default function useCurrentUser(): IUser {
-  const { data } = useQuery(GET_CURRENT_USER, { fetchPolicy: 'cache-and-network' });
+  const { data } = useQuery(GET_CURRENT_USER);
 
   return data?.getCurrentUser;
 }