diff --git a/src/frontend/src/components/settings/SettingList.tsx b/src/frontend/src/components/settings/SettingList.tsx
index e4a8893f6b73..5253539cac1f 100644
--- a/src/frontend/src/components/settings/SettingList.tsx
+++ b/src/frontend/src/components/settings/SettingList.tsx
@@ -41,7 +41,7 @@ export function SettingList({
   }, []);
 
   const allKeys = useMemo(
-    () => settingsState?.settings?.map((s) => s.key),
+    () => settingsState?.settings?.map((s) => s.key) ?? [],
     [settingsState?.settings]
   );
 
@@ -131,7 +131,7 @@ export function SettingList({
     <>
       {editSettingModal.modal}
       <Stack gap='xs'>
-        {(keys || allKeys).map((key, i) => {
+        {(keys || allKeys)?.map((key, i) => {
           const setting = settingsState?.settings?.find(
             (s: any) => s.key === key
           );