diff --git a/surfsense_web/atoms/user/user-mutation.atoms.ts b/surfsense_web/atoms/user/user-mutation.atoms.ts
index caf4436a5..301ec82c4 100644
--- a/surfsense_web/atoms/user/user-mutation.atoms.ts
+++ b/surfsense_web/atoms/user/user-mutation.atoms.ts
@@ -1,18 +1,18 @@
 import { atomWithMutation, queryClientAtom } from "jotai-tanstack-query";
 import type { UpdateUserRequest } from "@/contracts/types/user.types";
 import { userApiService } from "@/lib/apis/user-api.service";
-import { cacheKeys } from "@/lib/query-client/cache-keys";
+import { USER_QUERY_KEY } from "./user-query.atoms";
 
 export const updateUserMutationAtom = atomWithMutation((get) => {
 	const queryClient = get(queryClientAtom);
 
 	return {
-		mutationKey: cacheKeys.user.current(),
+		mutationKey: USER_QUERY_KEY,
 		mutationFn: async (request: UpdateUserRequest) => {
 			return userApiService.updateMe(request);
 		},
 		onSuccess: () => {
-			queryClient.invalidateQueries({ queryKey: cacheKeys.user.current() });
+			queryClient.invalidateQueries({ queryKey: USER_QUERY_KEY });
 		},
 	};
 });
diff --git a/surfsense_web/atoms/user/user-query.atoms.ts b/surfsense_web/atoms/user/user-query.atoms.ts
index 6b436d7a0..b7289568b 100644
--- a/surfsense_web/atoms/user/user-query.atoms.ts
+++ b/surfsense_web/atoms/user/user-query.atoms.ts
@@ -1,14 +1,16 @@
 import { atomWithQuery } from "jotai-tanstack-query";
 import { userApiService } from "@/lib/apis/user-api.service";
 import { getBearerToken, isPublicRoute } from "@/lib/auth-utils";
-import { cacheKeys } from "@/lib/query-client/cache-keys";
+
+export const USER_QUERY_KEY = ["user", "me"] as const;
+const userQueryFn = () => userApiService.getMe();
 
 export const currentUserAtom = atomWithQuery(() => {
 	const pathname = typeof window !== "undefined" ? window.location.pathname : null;
 	return {
-		queryKey: cacheKeys.user.current(),
-		staleTime: 5 * 60 * 1000, // 5 minutes
+		queryKey: USER_QUERY_KEY,
+		staleTime: 5 * 60 * 1000,
 		enabled: !!getBearerToken() && pathname !== null && !isPublicRoute(pathname),
-		queryFn: async () => userApiService.getMe(),
+		queryFn: userQueryFn,
 	};
 });