diff --git a/package.json b/package.json
index e91c06fc..dfedafd5 100644
--- a/package.json
+++ b/package.json
@@ -20,8 +20,8 @@
     "karma-jasmine": "^5.1.0",
     "karma-junit-reporter": "^2.0.1",
     "karma-webpack": "^5.0.0",
-    "linkifyjs": "^4.1.1",
     "linkify-string": "^4.1.1",
+    "linkifyjs": "^4.1.1",
     "protractor": "^7.0.0",
     "webpack": "^5.88.1",
     "webpack-cli": "^5.1.4",
@@ -47,6 +47,7 @@
     "angular-sanitize": "^1.8.3",
     "angular-touch": "^1.8.3",
     "bootstrap": "^3.4.1",
+    "emoji-regex": "8.0.0",
     "emojione": "^4.5.0",
     "favico.js": "^0.3.10",
     "zlibjs": "^0.3.1"
diff --git a/src/js/inputbar.js b/src/js/inputbar.js
index f6ba2b47..6cfe9828 100644
--- a/src/js/inputbar.js
+++ b/src/js/inputbar.js
@@ -1,6 +1,7 @@
 'use strict';
 
-
+import emojiRegexFunction from "emoji-regex"
+const emojiRegex = emojiRegexFunction()
 
 var weechat = angular.module('weechat');
 
@@ -36,8 +37,7 @@ weechat.directive('inputBar', function() {
                 // Cancel any command completion that was still ongoing
                 commandCompletionInputChanged = true;
 
-                var emojiRegex = /^(?:[\uD800-\uDBFF][\uDC00-\uDFFF])+$/, // *only* emoji
-                    changed = false,  // whether a segment was modified
+                var changed = false,  // whether a segment was modified
                     inputNode = $scope.getInputNode(),
                     caretPos = inputNode.selectionStart,
                     position = 0;  // current position in text