diff --git a/frontend/src/providers/providers-provider.tsx b/frontend/src/providers/providers-provider.tsx
index 9b981518..df025012 100644
--- a/frontend/src/providers/providers-provider.tsx
+++ b/frontend/src/providers/providers-provider.tsx
@@ -1,5 +1,5 @@
 import { useQuery } from '@apollo/client/react';
-import { createContext, useContext, useEffect, useMemo, useState } from 'react';
+import { createContext, useCallback, useContext, useEffect, useMemo, useState } from 'react';
 
 import type { Provider } from '@/models/provider';
 
@@ -28,7 +28,7 @@ export function ProvidersProvider({ children }: ProvidersProviderProps) {
         skip: !isAuthenticated(),
     });
 
-    const providers = sortProviders(providersData?.providers || []);
+    const providers = useMemo(() => sortProviders(providersData?.providers || []), [providersData?.providers]);
 
     const [selectedProviderName, setSelectedProviderName] = useState<null | string>(() => {
         return localStorage.getItem(SELECTED_PROVIDER_KEY);
@@ -56,15 +56,18 @@ export function ProvidersProvider({ children }: ProvidersProviderProps) {
         }
     }, [selectedProvider]);
 
-    const setSelectedProvider = (provider: Provider) => {
+    const setSelectedProvider = useCallback((provider: Provider) => {
         setSelectedProviderName(provider.name);
-    };
+    }, []);
 
-    const value = {
-        providers,
-        selectedProvider,
-        setSelectedProvider,
-    };
+    const value = useMemo(
+        () => ({
+            providers,
+            selectedProvider,
+            setSelectedProvider,
+        }),
+        [providers, selectedProvider, setSelectedProvider],
+    );
 
     return <ProvidersContext.Provider value={value}>{children}</ProvidersContext.Provider>;
 }
diff --git a/frontend/src/providers/system-settings-provider.tsx b/frontend/src/providers/system-settings-provider.tsx
index b48aaf11..539946d9 100644
--- a/frontend/src/providers/system-settings-provider.tsx
+++ b/frontend/src/providers/system-settings-provider.tsx
@@ -1,7 +1,7 @@
 import type { ReactNode } from 'react';
 
 import { useQuery } from '@apollo/client/react';
-import { createContext, use } from 'react';
+import { createContext, use, useMemo } from 'react';
 
 import type { SettingsFragmentFragment } from '@/graphql/types';
 
@@ -22,16 +22,15 @@ export function SystemSettingsProvider({ children }: { children: ReactNode }) {
         skip: !isAuthenticated(),
     });
 
-    return (
-        <SystemSettingsContext
-            value={{
-                isLoading: loading,
-                settings: settingsData?.settings ?? null,
-            }}
-        >
-            {children}
-        </SystemSettingsContext>
+    const value = useMemo<SettingsContextType>(
+        () => ({
+            isLoading: loading,
+            settings: settingsData?.settings ?? null,
+        }),
+        [loading, settingsData?.settings],
     );
+
+    return <SystemSettingsContext value={value}>{children}</SystemSettingsContext>;
 }
 
 export function useSystemSettings() {