diff --git a/doc/user/markdown.md b/doc/user/markdown.md
index d8bc3a9187e..8239742969a 100644
--- a/doc/user/markdown.md
+++ b/doc/user/markdown.md
@@ -267,10 +267,7 @@ However the wrapping tags cannot be mixed as such:
### Emoji
-> If this is not rendered correctly, see
-https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/user/markdown.md#emoji
-
-```
+```md
Sometimes you want to :monkey: around a bit and add some :star2: to your :speech_balloon:. Well we have a gift for you:
:zap: You can use emoji anywhere GFM is supported. :v:
@@ -288,15 +285,15 @@ On Linux, you can download [Noto Color Emoji](https://www.google.com/get/noto/he
Ubuntu 18.04 (like many modern Linux distros) has this font installed by default.
```
-Sometimes you want to 
around a bit and add some 
to your 
. Well we have a gift for you:
+Sometimes you want to around a bit and add some to your . Well we have a gift for you:
-
You can use emoji anywhere GFM is supported. 
+You can use emoji anywhere GFM is supported.
-You can use it to point out a 
or warn about 
patches. And if someone improves your really 
code, send them some 
. People will 
you for that.
+You can use it to point out a or warn about patches. And if someone improves your really code, send them some . People will you for that.
-If you are new to this, don't be 
. You can easily join the emoji 
. All you need to do is to look up one of the supported codes.
+If you are new to this, don't be . You can easily join the emoji . All you need to do is to look up one of the supported codes.
-Consult the [Emoji Cheat Sheet](https://www.webfx.com/tools/emoji-cheat-sheet/) for a list of all supported emoji codes. 
+Consult the [Emoji Cheat Sheet](https://www.webfx.com/tools/emoji-cheat-sheet/) for a list of all supported emoji codes.
Most emoji are natively supported on macOS, Windows, iOS, Android and will fallback to image-based emoji where there is lack of support.