diff --git a/src/Artemis.Core/Services/WebServer/WebServerService.cs b/src/Artemis.Core/Services/WebServer/WebServerService.cs
index 03ccb102f..9dbdfd283 100644
--- a/src/Artemis.Core/Services/WebServer/WebServerService.cs
+++ b/src/Artemis.Core/Services/WebServer/WebServerService.cs
@@ -125,6 +125,7 @@ internal class WebServerService : IWebServerService, IDisposable
         
         LayoutBuilder serverLayout = Layout.Create()
             .Add(PluginsHandler)
+            .Add(new StatusHandler())
             .Add(CorsPolicy.Permissive());
 
         // Add registered controllers to the API module as services.
diff --git a/src/Artemis.UI/Controllers/RemoteController.cs b/src/Artemis.UI/Controllers/RemoteController.cs
index 1aa86305f..1bcbaf032 100644
--- a/src/Artemis.UI/Controllers/RemoteController.cs
+++ b/src/Artemis.UI/Controllers/RemoteController.cs
@@ -28,6 +28,7 @@ public class RemoteController
     public void BringToForeground(IRequest request)
     {
         // Get the route from the request content stream
+        // TODO: Use [FromBody] attribute instead once GenHTTP allows omitting null values
         string? route = null;
         if (request.Content != null)
         {