diff --git a/packages/ui/src/components/theme-provider.tsx b/packages/ui/src/components/theme-provider.tsx
index d89a82e1..6e96753c 100644
--- a/packages/ui/src/components/theme-provider.tsx
+++ b/packages/ui/src/components/theme-provider.tsx
@@ -66,8 +66,9 @@ export function ThemeProvider({
 export const useTheme = () => {
   const context = useContext(ThemeProviderContext)
 
-  if (context === undefined)
-    throw new Error("useTheme must be used within a ThemeProvider")
+  // If the provider is missing, context will be initialState (setTheme is a no-op)
+  if (context.setTheme === initialState.setTheme)
+    throw new Error("useTheme must be used within a ThemeProvider: provider is missing")
 
   return context
 }