diff --git a/lib/gitlab/markdown.rb b/lib/gitlab/markdown.rb
index 57b37764..17f865bb 100644
--- a/lib/gitlab/markdown.rb
+++ b/lib/gitlab/markdown.rb
@@ -95,7 +95,7 @@ module Gitlab
 
       text = text.gsub(EMOJI_PATTERN) do |match|
         if valid_emoji?($2)
-          helper.image_tag("#{$2}.png", size: "20x20", class: 'emoji', title: $1, alt: $1)
+          image_tag("emoji/#{$2}.png", size: "20x20", class: 'emoji', title: $1, alt: $1)
         else
           match
         end