diff --git a/api/server/auth/auth.go b/api/server/auth/auth.go
index e01b95a0..6fce9712 100644
--- a/api/server/auth/auth.go
+++ b/api/server/auth/auth.go
@@ -28,7 +28,9 @@ func (h authHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 	// Determine the namespace
 	namespace, err := namespaceFromRequest(req)
 	if err != nil {
-		w.WriteHeader(http.StatusInternalServerError)
+		logger.Error(err)
+		// w.WriteHeader(http.StatusInternalServerError)
+		namespace = auth.DefaultNamespace
 		return
 	}