diff --git a/src/queries/page.server.ts b/src/queries/page.server.ts
index 955f7218..3f7b1a33 100644
--- a/src/queries/page.server.ts
+++ b/src/queries/page.server.ts
@@ -6,7 +6,7 @@ export const fetchGetPage = async (
   input: Parameters<typeof pageModel.getPage>[0],
   queryClient: QueryClient,
 ) => {
-  const key = ["getPage", input.site, input.page]
+  const key = ["getPage", input.page, input]
   return await queryClient.fetchQuery(key, async () => {
     return cacheGet(key, () => pageModel.getPage(input))
   })
@@ -16,7 +16,7 @@ export const prefetchGetPagesBySite = async (
   input: Parameters<typeof pageModel.getPagesBySite>[0],
   queryClient: QueryClient,
 ) => {
-  const key = ["getPagesBySite", input.site]
+  const key = ["getPagesBySite", input.site, input]
   await queryClient.prefetchQuery(key, async () => {
     return cacheGet(key, () => pageModel.getPagesBySite(input))
   })
@@ -26,7 +26,7 @@ export const fetchGetPagesBySite = async (
   input: Parameters<typeof pageModel.getPagesBySite>[0],
   queryClient: QueryClient,
 ) => {
-  const key = ["getPagesBySite", input.site]
+  const key = ["getPagesBySite", input.site, input]
   return await queryClient.fetchQuery(key, async () => {
     return cacheGet(key, () => pageModel.getPagesBySite(input))
   })
diff --git a/src/queries/site.server.ts b/src/queries/site.server.ts
index 03b96ab8..16e9b5d7 100644
--- a/src/queries/site.server.ts
+++ b/src/queries/site.server.ts
@@ -23,7 +23,7 @@ export const prefetchGetSiteSubscriptions = async (
   input: Parameters<typeof siteModel.getSiteSubscriptions>[0],
   queryClient: QueryClient,
 ) => {
-  const key = ["getSiteSubscriptions", input.siteId]
+  const key = ["getSiteSubscriptions", input]
   await queryClient.prefetchQuery(key, async () => {
     return cacheGet(key, () => siteModel.getSiteSubscriptions(input))
   })