diff --git a/Select.tsx b/Select.tsx
index fe7c401..7feca33 100644
--- a/Select.tsx
+++ b/Select.tsx
@@ -21,7 +21,7 @@ export default function Select({
   const {colors} = useTheme()
 
   const selected = useMemo(
-    () => items.find(item => item.value === value),
+    () => items.find(item => item.value === value) || items[0],
     [items, value],
   )
 
diff --git a/SettingsPage.tsx b/SettingsPage.tsx
index 5eac533..12c2603 100644
--- a/SettingsPage.tsx
+++ b/SettingsPage.tsx
@@ -224,7 +224,7 @@ export default function SettingsPage() {
           />
           {'theme'.includes(term.toLowerCase()) && (
             <Select
-              value={theme || 'system'}
+              value={theme}
               onChange={changeTheme}
               items={[
                 {label: 'Follow system theme', value: 'system'},