diff --git a/client/src/components/markdown.ts b/client/src/components/markdown.ts
index d5c846aa..984df4fc 100644
--- a/client/src/components/markdown.ts
+++ b/client/src/components/markdown.ts
@@ -201,7 +201,7 @@ const rules: MarkdownRules = {
   },
   emoji: {
     order: md.defaultRules.strong.order,
-    match: (source) => /^:([a-zA-z_-]*):/.exec(source),
+    match: (source) => /^:([^:\s]+):/.exec(source),
     parse(capture) {
       return {
         id: capture[1],
diff --git a/docs/changelog.md b/docs/changelog.md
index db58b15c..ff1838c2 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -4,6 +4,7 @@
 
 ### Bugs
 - Fixed fullscreen incompatibility for Safari [#121](https://github.com/m1k1o/neko/issues/121).
+- Fixed bad emoji matching for e.g. `:+1:` and `:100:` with new regex `/^:([^:\s]+):/`.
 
 ### New Features
 - Added `m1k1o/neko:microsoft-edge` tag.