diff --git a/router/router.go b/router/router.go
index 4a564bc58..38d8ee170 100644
--- a/router/router.go
+++ b/router/router.go
@@ -383,11 +383,6 @@ func Start() error {
 	http.HandleFunc("/api/auth/fediverse", middleware.RequireUserAccessToken(fediverseauth.RegisterFediverseOTPRequest))
 	http.HandleFunc("/api/auth/fediverse/verify", fediverseauth.VerifyFediverseOTPRequest)
 
-	// Redirect /embed/chat
-	http.HandleFunc("/embed/chat", func(w http.ResponseWriter, r *http.Request) {
-		http.Redirect(w, r, "/embed/chat/readonly", http.StatusTemporaryRedirect)
-	})
-
 	// ActivityPub has its own router
 	activitypub.Start(data.GetDatastore())
 
@@ -399,6 +394,13 @@ func Start() error {
 	// Optional public static files
 	http.Handle("/public/", http.StripPrefix("/public/", http.FileServer(http.Dir(config.PublicFilesPath))))
 
+	// Redirect /embed/chat
+	http.HandleFunc("/embed/chat/", func(w http.ResponseWriter, r *http.Request) {
+		if r.URL.Path == "/embed/chat/" || r.URL.Path == "/embed/chat" {
+			http.Redirect(w, r, "/embed/chat/readonly", http.StatusTemporaryRedirect)
+		}
+	})
+
 	port := config.WebServerPort
 	ip := config.WebServerIP