diff --git a/src/mixins/theme.js b/src/mixins/theme.js
index 73a52e20b..fc593eb0d 100644
--- a/src/mixins/theme.js
+++ b/src/mixins/theme.js
@@ -33,7 +33,7 @@ export default {
                 return "light";
             }
 
-            if (this.path === "/status-page" || this.path === "/status") {
+            if (this.path.startsWith("/status-page") || this.path.startsWith("/status")) {
                 return this.statusPageTheme;
             } else {
                 if (this.userTheme === "auto") {
diff --git a/src/pages/StatusPage.vue b/src/pages/StatusPage.vue
index 935e6ac00..da60c2fea 100644
--- a/src/pages/StatusPage.vue
+++ b/src/pages/StatusPage.vue
@@ -403,7 +403,7 @@ export default {
 
         // Set Theme
         "config.theme"() {
-            this.$root.userTheme = this.config.theme;
+            this.$root.statusPageTheme = this.config.theme;
             this.loadedTheme = true;
         },