diff --git a/server/routers/api-router.js b/server/routers/api-router.js
index ab2043b1..8dd5189c 100644
--- a/server/routers/api-router.js
+++ b/server/routers/api-router.js
@@ -13,7 +13,7 @@ router.get("/api/entry-page", async (_, response) => {
 router.get("/api/status-page/config", async (_request, response) => {
     allowDevAllOrigin(response);
 
-    let config = getSettings("statusPage");
+    let config = await getSettings("statusPage");
 
     if (! config.statusPageTheme) {
         config.statusPageTheme = "light";
diff --git a/server/socket-handlers/status-page-socket-handler.js b/server/socket-handlers/status-page-socket-handler.js
index 0a4bf05c..5ba173f3 100644
--- a/server/socket-handlers/status-page-socket-handler.js
+++ b/server/socket-handlers/status-page-socket-handler.js
@@ -72,10 +72,10 @@ module.exports.statusPageSocketHandler = (socket) => {
         try {
             checkLogin(socket);
 
+            // Save Config
+            await setSettings("statusPage", config);
+
             await R.transaction(async (trx) => {
-                // Save Config
-                //TODO
-                await setSettings("statusPage", config);
 
                 // Save Icon