diff --git a/Libraries/Core/Servers/HttpServer.cs b/Libraries/Core/Servers/HttpServer.cs
index f745bf61..23ef0cb5 100644
--- a/Libraries/Core/Servers/HttpServer.cs
+++ b/Libraries/Core/Servers/HttpServer.cs
@@ -61,7 +61,12 @@ public class HttpServer(
             KeepAliveInterval = TimeSpan.FromSeconds(60)
         });
 
-        app.MapFallback(HandleFallback);
+        app?.Use(
+            (HttpContext req, RequestDelegate _) =>
+            {
+                return Task.Factory.StartNew(async () => await HandleFallback(req));
+            }
+        );
 
         _started = true;