diff --git a/modules/markup/html.go b/modules/markup/html.go
index 7c4c10ee22..4d1b49e241 100644
--- a/modules/markup/html.go
+++ b/modules/markup/html.go
@@ -484,7 +484,7 @@ func createCustomEmoji(alias, class string) *html.Node {
 	}
 	if class != "" {
 		img.Attr = append(img.Attr, html.Attribute{Key: "alt", Val: fmt.Sprintf(`:%s:`, alias)})
-		img.Attr = append(img.Attr, html.Attribute{Key: "src", Val: fmt.Sprintf(`%s/img/emoji/%s.png`, setting.StaticURLPrefix, alias)})
+		img.Attr = append(img.Attr, html.Attribute{Key: "src", Val: fmt.Sprintf(`%s/assets/img/emoji/%s.png`, setting.StaticURLPrefix, alias)})
 	}
 
 	span.AppendChild(img)
diff --git a/modules/markup/html_test.go b/modules/markup/html_test.go
index 3425c3d3a8..fa8c848601 100644
--- a/modules/markup/html_test.go
+++ b/modules/markup/html_test.go
@@ -283,7 +283,7 @@ func TestRender_emoji(t *testing.T) {
 	//Text that should be turned into or recognized as emoji
 	test(
 		":gitea:",
-		`<p><span class="emoji" aria-label="gitea"><img alt=":gitea:" src="`+setting.StaticURLPrefix+`/img/emoji/gitea.png"/></span></p>`)
+		`<p><span class="emoji" aria-label="gitea"><img alt=":gitea:" src="`+setting.StaticURLPrefix+`/assets/img/emoji/gitea.png"/></span></p>`)
 
 	test(
 		"Some text with 😄 in the middle",