diff --git a/ProjectLighthouse/StartupTasks.cs b/ProjectLighthouse/StartupTasks.cs
index 100c3fc1..9df051c0 100644
--- a/ProjectLighthouse/StartupTasks.cs
+++ b/ProjectLighthouse/StartupTasks.cs
@@ -83,13 +83,16 @@ public static class StartupTasks
         {
             FileHelper.ConvertAllTexturesToPng();
         }
-
-        Logger.Info("Starting room cleanup thread...", LogArea.Startup);
-        RoomHelper.StartCleanupThread();
-
+        
         Logger.Info("Initializing Redis...", LogArea.Startup);
         RedisDatabase.Initialize().Wait();
 
+        if (serverType == ServerType.GameServer)
+        {
+            Logger.Info("Starting room cleanup thread...", LogArea.Startup);
+            RoomHelper.StartCleanupThread();
+        }
+
         stopwatch.Stop();
         Logger.Success($"Ready! Startup took {stopwatch.ElapsedMilliseconds}ms. Passing off control to ASP.NET...", LogArea.Startup);
     }