diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php
index 0f988666d..d9975c975 100644
--- a/resources/views/layouts/base.blade.php
+++ b/resources/views/layouts/base.blade.php
@@ -83,6 +83,9 @@
 
             function checkTheme() {
                 theme = localStorage.theme
+                if (theme == 'system') {
+                    theme = window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light'
+                }
                 if (theme == 'dark') {
                     baseColor = '#FCD452'
                     textColor = '#ffffff'