diff --git a/backend/btrixcloud/orgs.py b/backend/btrixcloud/orgs.py
index b99d88ac..60e9e57f 100644
--- a/backend/btrixcloud/orgs.py
+++ b/backend/btrixcloud/orgs.py
@@ -407,7 +407,11 @@ def init_orgs_api(app, mdb, user_manager, invites, user_dep: User):
         org: Organization = Depends(org_owner_dep),
     ):
         org.name = rename.name
-        await ops.update(org)
+        try:
+            await ops.update(org)
+        except DuplicateKeyError:
+            # pylint: disable=raise-missing-from
+            raise HTTPException(status_code=400, detail="duplicate_org_name")
 
         return {"updated": True}