diff --git a/src/mixins/theme.js b/src/mixins/theme.js
index 2f7867df0..e3b361ee8 100644
--- a/src/mixins/theme.js
+++ b/src/mixins/theme.js
@@ -30,6 +30,9 @@ export default {
         theme() {
             // As entry can be status page now, set forceStatusPageTheme to true to use status page theme
             if (this.forceStatusPageTheme) {
+                if (this.statusPageTheme === "auto") {
+                    return this.system;
+                }
                 return this.statusPageTheme;
             }