diff --git a/authentik/root/monitoring.py b/authentik/root/monitoring.py
index 17deefb65..2c0b2d129 100644
--- a/authentik/root/monitoring.py
+++ b/authentik/root/monitoring.py
@@ -1,6 +1,5 @@
 """Metrics view"""
 from base64 import b64encode
-from json import JSONDecodeError
 
 from django.conf import settings
 from django.db import connections
@@ -32,10 +31,7 @@ class MetricsView(View):
 
         monitoring_set.send_robust(self)
 
-        try:
-            return ExportToDjangoView(request)
-        except (UnicodeDecodeError, KeyError, ValueError, JSONDecodeError):
-            return HttpResponse(status_code=500)
+        return ExportToDjangoView(request)
 
 
 class LiveView(View):
diff --git a/internal/gounicorn/gounicorn.go b/internal/gounicorn/gounicorn.go
index a63cc43ac..f41f219b3 100644
--- a/internal/gounicorn/gounicorn.go
+++ b/internal/gounicorn/gounicorn.go
@@ -83,20 +83,14 @@ func (g *GoUnicorn) healthcheck() {
 
 	// Default healthcheck is every 1 second on startup
 	// once we've been healthy once, increase to 30 seconds
-	func() {
-		for {
-			select {
-			case <-time.Tick(1 * time.Second):
-				if check() {
-					g.log.Info("backend is alive, backing off with healthchecks")
-					g.HealthyCallback()
-					return
-				} else {
-					g.log.Debug("backend not alive yet")
-				}
-			}
+	for range time.Tick(time.Second) {
+		if check() {
+			g.log.Info("backend is alive, backing off with healthchecks")
+			g.HealthyCallback()
+			break
 		}
-	}()
+		g.log.Debug("backend not alive yet")
+	}
 	for range time.Tick(30 * time.Second) {
 		check()
 	}