diff --git a/server/src/api/community.rs b/server/src/api/community.rs
index 2a517bb8c..618122b98 100644
--- a/server/src/api/community.rs
+++ b/server/src/api/community.rs
@@ -311,6 +311,10 @@ impl Perform for Oper<EditCommunity> {
       Err(_e) => return Err(APIError::err("not_logged_in").into()),
     };
 
+    if !is_valid_community_name(&data.name) {
+      return Err(APIError::err("invalid_community_name").into());
+    }
+
     let user_id = claims.id;
 
     let conn = pool.get()?;
diff --git a/ui/translations/en.json b/ui/translations/en.json
index 874172237..a07da6216 100644
--- a/ui/translations/en.json
+++ b/ui/translations/en.json
@@ -27,6 +27,7 @@
     "number_of_communities": "{{count}} Community",
     "number_of_communities_plural": "{{count}} Communities",
     "community_reqs": "lowercase, underscores, and no spaces.",
+    "invalid_community_name": "Invalid name.",
     "create_private_message": "Create Private Message",
     "send_secure_message": "Send Secure Message",
     "send_message": "Send Message",