diff --git a/plugins/emoji/assets/javascripts/emoji.js.erb b/plugins/emoji/assets/javascripts/emoji.js.erb
index 0dbaf8a364c..114237a7ab9 100644
--- a/plugins/emoji/assets/javascripts/emoji.js.erb
+++ b/plugins/emoji/assets/javascripts/emoji.js.erb
@@ -61,6 +61,10 @@ var urlFor = function(code) {
     url = Discourse.getURL('/plugins/emoji/images/' + code + '.png');
   }
 
+  if(url && url[0] !== 'h' && Discourse.CDN) {
+    url = Discourse.CDN + url;
+  }
+
   return url;
 }