1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/client/v2_alpha/register.py b/synapse/rest/client/v2_alpha/register.py
index bfd7d30a23..b4b598a789 100644
--- a/synapse/rest/client/v2_alpha/register.py
+++ b/synapse/rest/client/v2_alpha/register.py
@@ -426,7 +426,7 @@ class RegisterRestServlet(RestServlet):
                     if org_parts[0] == "matrix" and org_parts[1] == "org":
                         org = "Tchap Admin"
                     elif org_parts[-2] == "gouv":
-                        org = org_parts[-3] or org_parts[-2]
+                        org = org_parts[-3] if len(org_parts) > 2 else org_parts[-2]
                     else:
                         org = org_parts[-2]