diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4510dc2..525e2bf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased]
 
+### Added
+
+- Detect preferred color scheme.
+
 ## [1.21.0] - 2023-04-12
 
 ### Changed
diff --git a/src/composables/theme.ts b/src/composables/theme.ts
index ab058dc..098b689 100644
--- a/src/composables/theme.ts
+++ b/src/composables/theme.ts
@@ -9,7 +9,15 @@ enum Theme {
   Dark = "dark",
 }
 
-const currentTheme = ref(Theme.Light)
+function defaultTheme(): Theme {
+  if (window.matchMedia("(prefers-color-scheme: dark)").matches) {
+    return Theme.Dark
+  } else {
+    return Theme.Light
+  }
+}
+
+const currentTheme = ref(defaultTheme())
 
 export function useTheme() {
 
@@ -36,7 +44,7 @@ export function useTheme() {
     const { ensureCurrentUser } = useCurrentUser()
     const currentUser = ensureCurrentUser()
     const clientConfig = currentUser.client_config[APP_NAME] || {}
-    const theme = clientConfig.theme || Theme.Light
+    const theme = clientConfig.theme || defaultTheme()
     setTheme(theme as Theme)
   }