diff --git a/zerver/lib/emoji.py b/zerver/lib/emoji.py
index 862abf48d4..c406250337 100644
--- a/zerver/lib/emoji.py
+++ b/zerver/lib/emoji.py
@@ -111,13 +111,13 @@ def check_remove_custom_emoji(user_profile: UserProfile, emoji_name: str) -> Non
 
 def check_valid_emoji_name(emoji_name: str) -> None:
     if emoji_name:
-        if re.match(r"^[0-9a-z.\-_]+(?<![.\-_])$", emoji_name):
+        if re.match(r"^[0-9a-z\-_]+(?<![\-_])$", emoji_name):
             return
-        if re.match(r"^[0-9a-z.\-_]+$", emoji_name):
-            raise JsonableError(_("Emoji names must end with either a letter or number."))
+        if re.match(r"^[0-9a-z\-_]+$", emoji_name):
+            raise JsonableError(_("Emoji names must end with either a letter or digit."))
         raise JsonableError(
             _(
-                "Emoji names must contain only numbers, lowercase English letters, spaces, dashes, underscores, and periods.",
+                "Emoji names must contain only lowercase English letters, digits, spaces, dashes, and underscores.",
             )
         )
     raise JsonableError(_("Emoji name is missing"))
diff --git a/zerver/tests/test_realm_emoji.py b/zerver/tests/test_realm_emoji.py
index 8d169a6c81..2c3b24fd0b 100644
--- a/zerver/tests/test_realm_emoji.py
+++ b/zerver/tests/test_realm_emoji.py
@@ -120,7 +120,7 @@ class RealmEmojiTest(ZulipTestCase):
             result = self.client_post("/json/realm/emoji/my_em*oji", info=emoji_data)
         self.assert_json_error(
             result,
-            "Emoji names must contain only numbers, lowercase English letters, spaces, dashes, underscores, and periods.",
+            "Emoji names must contain only lowercase English letters, digits, spaces, dashes, and underscores.",
         )
 
     def test_forward_slash_exception(self) -> None:
@@ -132,7 +132,7 @@ class RealmEmojiTest(ZulipTestCase):
             )
         self.assert_json_error(
             result,
-            "Emoji names must contain only numbers, lowercase English letters, spaces, dashes, underscores, and periods.",
+            "Emoji names must contain only lowercase English letters, digits, spaces, dashes, and underscores.",
         )
 
     def test_upload_uppercase_exception(self) -> None:
@@ -142,7 +142,7 @@ class RealmEmojiTest(ZulipTestCase):
             result = self.client_post("/json/realm/emoji/my_EMoji", info=emoji_data)
         self.assert_json_error(
             result,
-            "Emoji names must contain only numbers, lowercase English letters, spaces, dashes, underscores, and periods.",
+            "Emoji names must contain only lowercase English letters, digits, spaces, dashes, and underscores.",
         )
 
     def test_upload_end_character_exception(self) -> None:
@@ -150,7 +150,7 @@ class RealmEmojiTest(ZulipTestCase):
         with get_test_image_file("img.png") as fp1:
             emoji_data = {"f1": fp1}
             result = self.client_post("/json/realm/emoji/my_emoji_", info=emoji_data)
-        self.assert_json_error(result, "Emoji names must end with either a letter or number.")
+        self.assert_json_error(result, "Emoji names must end with either a letter or digit.")
 
     def test_missing_name_exception(self) -> None:
         self.login("iago")