diff --git a/authentik/core/migrations/0022_authenticatedsession.py b/authentik/core/migrations/0022_authenticatedsession.py
index bee03ae13..d28c2ccb9 100644
--- a/authentik/core/migrations/0022_authenticatedsession.py
+++ b/authentik/core/migrations/0022_authenticatedsession.py
@@ -4,6 +4,7 @@ import uuid
 
 import django.db.models.deletion
 from django.apps.registry import Apps
+from django.conf import settings
 from django.db import migrations, models
 from django.db.backends.base.schema import BaseDatabaseSchemaEditor
 
diff --git a/authentik/core/urls.py b/authentik/core/urls.py
index 181f8918f..f221ffbe0 100644
--- a/authentik/core/urls.py
+++ b/authentik/core/urls.py
@@ -35,4 +35,10 @@ urlpatterns = [
         ensure_csrf_cookie(TemplateView.as_view(template_name="if/flow.html")),
         name="if-flow",
     ),
+    # Fallback for WS
+    path("ws/outpost/<uuid:pk>/", TemplateView.as_view(template_name="if/admin.html")),
+    path(
+        "ws/client/",
+        TemplateView.as_view(template_name="if/admin.html"),
+    ),
 ]
diff --git a/authentik/outposts/models.py b/authentik/outposts/models.py
index e24b90305..47486bc2f 100644
--- a/authentik/outposts/models.py
+++ b/authentik/outposts/models.py
@@ -380,7 +380,6 @@ class Outpost(models.Model):
         tokens = Token.filter_not_expired(
             identifier=self.token_identifier,
             intent=TokenIntents.INTENT_API,
-            managed=managed,
         )
         if tokens.exists():
             token = tokens.first()
diff --git a/tests/e2e/test_provider_proxy.py b/tests/e2e/test_provider_proxy.py
index 48658c5fd..6a8ad3651 100644
--- a/tests/e2e/test_provider_proxy.py
+++ b/tests/e2e/test_provider_proxy.py
@@ -88,16 +88,6 @@ class TestProviderProxy(SeleniumTestCase):
 
         self.proxy_container = self.start_proxy(outpost)
 
-        # Wait until outpost healthcheck succeeds
-        healthcheck_retries = 0
-        while healthcheck_retries < 50:
-            if len(outpost.state) > 0:
-                state = outpost.state[0]
-                if state.last_seen:
-                    break
-            healthcheck_retries += 1
-            sleep(0.5)
-
         self.driver.get("http://localhost:4180")
         self.login()
         sleep(1)