diff --git a/packages/web/src/theme.ts b/packages/web/src/theme.ts
index 5534e73646..b12fc0b7db 100644
--- a/packages/web/src/theme.ts
+++ b/packages/web/src/theme.ts
@@ -45,12 +45,8 @@ type Theme = 'dark-mode' | 'light-mode';
 
 const listeners = new Set<(theme: Theme) => void>();
 export function toggleTheme() {
-  const oldTheme = settings.getString('theme', 'light-mode');
-  let newTheme: Theme;
-  if (oldTheme === 'dark-mode')
-    newTheme = 'light-mode';
-  else
-    newTheme = 'dark-mode';
+  const oldTheme = currentTheme();
+  const newTheme = oldTheme === 'dark-mode' ? 'light-mode' : 'dark-mode';
 
   if (oldTheme)
     document.body.classList.remove(oldTheme);