diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2b21a8635b61d678405105d482183afd79a6ccac..afa3f0ea161601bdd067c28545508c55bfb80a4e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,8 +42,8 @@ nginx-validation:
     - "curl -v -H 'Host: chat.codimd.org' http://localhost/ 2>&1 | grep -q 'https://matrix.to/#/#hedgedoc:matrix.org'"
     - "curl -v -H 'Host: chat.hedgedoc.org' http://localhost/ 2>&1 | grep -q 'https://matrix.to/#/#hedgedoc:matrix.org'"
     # Test Developer Chat
-    - "curl -v -H 'Host: chat.codimd.org' http://localhost/development 2>&1 | grep -q 'https://matrix.to/#/#hedgedoc:matrix.org'"
-    - "curl -v -H 'Host: chat.hedgedoc.org' http://localhost/development 2>&1 | grep -q 'https://matrix.to/#/#hedgedoc:matrix.org'"
+    - "curl -v -H 'Host: chat.codimd.org' http://localhost/development 2>&1 | grep -q 'https://matrix.to/#/#hedgedoc-dev:matrix.org'"
+    - "curl -v -H 'Host: chat.hedgedoc.org' http://localhost/development 2>&1 | grep -q 'https://matrix.to/#/#hedgedoc-dev:matrix.org'"
     # Cleanup
     - podman stop testing
     - podman rm testing
diff --git a/nginx.d/zz_chat.conf b/nginx.d/zz_chat.conf
index d6d691d3f49462aae5ac1baee753f913131f436e..c0288fa0339c689f620fe5336c44c4abd93917a0 100644
--- a/nginx.d/zz_chat.conf
+++ b/nginx.d/zz_chat.conf
@@ -10,6 +10,8 @@ server {
           return 302 https://matrix.to/#/#hedgedoc-dev:matrix.org;
         }
 
+        location = / {
+          return 302 https://matrix.to/#/#hedgedoc:matrix.org;
+        }
 
-        return 302 https://matrix.to/#/#hedgedoc:matrix.org;
 }