diff --git a/web/src/components/mobile/MobilePage.tsx b/web/src/components/mobile/MobilePage.tsx
index 692ffbcdb..ee56468cb 100644
--- a/web/src/components/mobile/MobilePage.tsx
+++ b/web/src/components/mobile/MobilePage.tsx
@@ -55,9 +55,9 @@ export function MobilePage({
   });
 
   return (
-    <MobilePageContext.Provider value={{ open, onOpenChange: setOpen }}>
+    <MobilePageContext value={{ open, onOpenChange: setOpen }}>
       {children}
-    </MobilePageContext.Provider>
+    </MobilePageContext>
   );
 }
 
diff --git a/web/src/components/ui/carousel.tsx b/web/src/components/ui/carousel.tsx
index 98b7d6cbd..7c6f1189a 100644
--- a/web/src/components/ui/carousel.tsx
+++ b/web/src/components/ui/carousel.tsx
@@ -120,7 +120,7 @@ const Carousel = React.forwardRef<
     }, [api, onSelect]);
 
     return (
-      <CarouselContext.Provider
+      <CarouselContext
         value={{
           carouselRef,
           api: api,
@@ -143,7 +143,7 @@ const Carousel = React.forwardRef<
         >
           {children}
         </div>
-      </CarouselContext.Provider>
+      </CarouselContext>
     );
   },
 );
diff --git a/web/src/components/ui/form.tsx b/web/src/components/ui/form.tsx
index dc6102ea2..aa4db1f36 100644
--- a/web/src/components/ui/form.tsx
+++ b/web/src/components/ui/form.tsx
@@ -33,9 +33,9 @@ const FormField = <
   ...props
 }: ControllerProps<TFieldValues, TName>) => {
   return (
-    <FormFieldContext.Provider value={{ name: props.name }}>
+    <FormFieldContext value={{ name: props.name }}>
       <Controller {...props} />
-    </FormFieldContext.Provider>
+    </FormFieldContext>
   );
 };
 
@@ -77,9 +77,9 @@ const FormItem = React.forwardRef<
   const id = React.useId();
 
   return (
-    <FormItemContext.Provider value={{ id }}>
+    <FormItemContext value={{ id }}>
       <div ref={ref} className={cn("space-y-1", className)} {...props} />
-    </FormItemContext.Provider>
+    </FormItemContext>
   );
 });
 FormItem.displayName = "FormItem";
diff --git a/web/src/components/ui/sidebar.tsx b/web/src/components/ui/sidebar.tsx
index 5a21a6cc1..e7dc78de7 100644
--- a/web/src/components/ui/sidebar.tsx
+++ b/web/src/components/ui/sidebar.tsx
@@ -141,7 +141,7 @@ const SidebarProvider = React.forwardRef<
     );
 
     return (
-      <SidebarContext.Provider value={contextValue}>
+      <SidebarContext value={contextValue}>
         <TooltipProvider delayDuration={0}>
           <div
             style={
@@ -161,7 +161,7 @@ const SidebarProvider = React.forwardRef<
             {children}
           </div>
         </TooltipProvider>
-      </SidebarContext.Provider>
+      </SidebarContext>
     );
   },
 );
diff --git a/web/src/components/ui/toggle-group.tsx b/web/src/components/ui/toggle-group.tsx
index 19505f9a4..85710b4a3 100644
--- a/web/src/components/ui/toggle-group.tsx
+++ b/web/src/components/ui/toggle-group.tsx
@@ -22,9 +22,9 @@ const ToggleGroup = React.forwardRef<
     className={cn("flex items-center justify-center gap-1", className)}
     {...props}
   >
-    <ToggleGroupContext.Provider value={{ variant, size }}>
+    <ToggleGroupContext value={{ variant, size }}>
       {children}
-    </ToggleGroupContext.Provider>
+    </ToggleGroupContext>
   </ToggleGroupPrimitive.Root>
 ))
 
diff --git a/web/src/context/auth-context.tsx b/web/src/context/auth-context.tsx
index f863c8c06..8789848ca 100644
--- a/web/src/context/auth-context.tsx
+++ b/web/src/context/auth-context.tsx
@@ -103,8 +103,8 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
   };
 
   return (
-    <AuthContext.Provider value={{ auth, login, logout }}>
+    <AuthContext value={{ auth, login, logout }}>
       {children}
-    </AuthContext.Provider>
+    </AuthContext>
   );
 }
diff --git a/web/src/context/detail-stream-context.tsx b/web/src/context/detail-stream-context.tsx
index 67c06f981..ff3435ed8 100644
--- a/web/src/context/detail-stream-context.tsx
+++ b/web/src/context/detail-stream-context.tsx
@@ -126,9 +126,9 @@ export function DetailStreamProvider({
   };
 
   return (
-    <DetailStreamContext.Provider value={value}>
+    <DetailStreamContext value={value}>
       {children}
-    </DetailStreamContext.Provider>
+    </DetailStreamContext>
   );
 }
 
diff --git a/web/src/context/language-provider.tsx b/web/src/context/language-provider.tsx
index 88ade5032..5c01052a6 100644
--- a/web/src/context/language-provider.tsx
+++ b/web/src/context/language-provider.tsx
@@ -77,9 +77,9 @@ export function LanguageProvider({
   };
 
   return (
-    <LanguageProviderContext.Provider {...props} value={value}>
+    <LanguageProviderContext {...props} value={value}>
       {children}
-    </LanguageProviderContext.Provider>
+    </LanguageProviderContext>
   );
 }
 
diff --git a/web/src/context/statusbar-provider.tsx b/web/src/context/statusbar-provider.tsx
index 03c4752dc..009cb59a1 100644
--- a/web/src/context/statusbar-provider.tsx
+++ b/web/src/context/statusbar-provider.tsx
@@ -107,10 +107,10 @@ export function StatusBarMessagesProvider({
   }, []);
 
   return (
-    <StatusBarMessagesContext.Provider
+    <StatusBarMessagesContext
       value={{ messages, addMessage, removeMessage, clearMessages }}
     >
       {children}
-    </StatusBarMessagesContext.Provider>
+    </StatusBarMessagesContext>
   );
 }
diff --git a/web/src/context/streaming-settings-provider.tsx b/web/src/context/streaming-settings-provider.tsx
index bcf6da9c5..affa2e4c9 100644
--- a/web/src/context/streaming-settings-provider.tsx
+++ b/web/src/context/streaming-settings-provider.tsx
@@ -44,7 +44,7 @@ export function StreamingSettingsProvider({
   }, [allGroupsStreamingSettings, setPersistedGroupStreamingSettings]);
 
   return (
-    <StreamingSettingsContext.Provider
+    <StreamingSettingsContext
       value={{
         allGroupsStreamingSettings,
         setAllGroupsStreamingSettings,
@@ -52,7 +52,7 @@ export function StreamingSettingsProvider({
       }}
     >
       {children}
-    </StreamingSettingsContext.Provider>
+    </StreamingSettingsContext>
   );
 }
 
diff --git a/web/src/context/theme-provider.tsx b/web/src/context/theme-provider.tsx
index d2be5e7ee..1112bf925 100644
--- a/web/src/context/theme-provider.tsx
+++ b/web/src/context/theme-provider.tsx
@@ -124,9 +124,9 @@ export function ThemeProvider({
   };
 
   return (
-    <ThemeProviderContext.Provider {...props} value={value}>
+    <ThemeProviderContext {...props} value={value}>
       {children}
-    </ThemeProviderContext.Provider>
+    </ThemeProviderContext>
   );
 }