diff --git a/package.json b/package.json
index f1d60023..c63ead88 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,6 @@
     "markdown-it-abbr": "~1.0.4",
     "markdown-it-container": "~2.0.0",
     "markdown-it-deflist": "~2.0.3",
-    "markdown-it-emoji": "~1.4.0",
     "markdown-it-footnote": "~3.0.2",
     "markdown-it-imsize": "~2.0.1",
     "markdown-it-ins": "~2.0.0",
@@ -107,10 +106,10 @@
     "mysql": "~2.17.1",
     "mysql2": "^2.0.1",
     "passport": "~0.4.0",
+    "passport-bitbucket-oauth2": "~0.1.2",
     "passport-dropbox-oauth2": "~1.1.0",
     "passport-facebook": "~2.1.1",
     "passport-github": "~1.1.0",
-    "passport-bitbucket-oauth2": "~0.1.2",
     "passport-gitlab2": "~4.0.0",
     "passport-google-oauth20": "~1.0.0",
     "passport-ldapauth": "~2.1.3",
diff --git a/public/js/extra.js b/public/js/extra.js
index adbfdecc..39dc2a7a 100644
--- a/public/js/extra.js
+++ b/public/js/extra.js
@@ -1057,10 +1057,6 @@ md.use(require('markdown-it-mathjax')({
 md.use(require('markdown-it-imsize'))
 md.use(require('markdown-it-ruby'))
 
-md.use(require('markdown-it-emoji'), {
-  shortcuts: {}
-})
-
 window.emojify.setConfig({
   blacklist: {
     elements: ['script', 'textarea', 'a', 'pre', 'code', 'svg'],
@@ -1070,8 +1066,6 @@ window.emojify.setConfig({
   ignore_emoticons: true
 })
 
-md.renderer.rules.emoji = (token, idx) => window.emojify.replace(`:${token[idx].markup}:`)
-
 function renderContainer (tokens, idx, options, env, self) {
   tokens[idx].attrJoin('role', 'alert')
   tokens[idx].attrJoin('class', 'alert')
diff --git a/yarn.lock b/yarn.lock
index 22fb8e04..97843d2b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7946,11 +7946,6 @@ markdown-it-deflist@~2.0.3:
   resolved "https://registry.yarnpkg.com/markdown-it-deflist/-/markdown-it-deflist-2.0.3.tgz#5727db04184d3cb2bc6ee4a9641e3a1091d5fd6f"
   integrity sha512-/BNZ8ksW42bflm1qQLnRI09oqU2847Z7MVavrR0MORyKLtiUYOMpwtlAfMSZAQU9UCvaUZMpgVAqoS3vpToJxw==
 
-markdown-it-emoji@~1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/markdown-it-emoji/-/markdown-it-emoji-1.4.0.tgz#9bee0e9a990a963ba96df6980c4fddb05dfb4dcc"
-  integrity sha1-m+4OmpkKljupbfaYDE/dsF37Tcw=
-
 markdown-it-footnote@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/markdown-it-footnote/-/markdown-it-footnote-3.0.2.tgz#1575ee7a093648d4e096aa33386b058d92ac8bc1"