diff --git a/web/src/hooks/queries/useSkills.ts b/web/src/hooks/queries/useSkills.ts
index b97dbc21..a50ee079 100644
--- a/web/src/hooks/queries/useSkills.ts
+++ b/web/src/hooks/queries/useSkills.ts
@@ -42,7 +42,9 @@ export function useSkills(
             return await api.getSkills(sessionId)
         },
         enabled: Boolean(api && sessionId),
-        staleTime: Infinity,
+        staleTime: 30_000,
+        refetchInterval: 30_000,
+        refetchOnWindowFocus: 'always',
         gcTime: 30 * 60 * 1000,
         retry: false,
     })
diff --git a/web/src/hooks/queries/useSlashCommands.ts b/web/src/hooks/queries/useSlashCommands.ts
index 1a3ce89f..593ae026 100644
--- a/web/src/hooks/queries/useSlashCommands.ts
+++ b/web/src/hooks/queries/useSlashCommands.ts
@@ -44,7 +44,9 @@ export function useSlashCommands(
             return await api.getSlashCommands(sessionId)
         },
         enabled: Boolean(api && sessionId),
-        staleTime: Infinity,
+        staleTime: 30_000,
+        refetchInterval: 30_000,
+        refetchOnWindowFocus: 'always',
         gcTime: 30 * 60 * 1000,
         retry: false, // Don't retry RPC failures
     })