diff --git a/lib/cooked_post_processor.rb b/lib/cooked_post_processor.rb
index b7b957a687f..233f299d11a 100644
--- a/lib/cooked_post_processor.rb
+++ b/lib/cooked_post_processor.rb
@@ -66,6 +66,8 @@ class CookedPostProcessor
     @doc.css("img[src]") -
     # minus, data images
     @doc.css("img[src^='data']") -
+    # minus, emojis
+    @doc.css("img.emoji") -
     # minus, image inside oneboxes
     oneboxed_images -
     # minus, images inside quotes
diff --git a/spec/components/cooked_post_processor_spec.rb b/spec/components/cooked_post_processor_spec.rb
index 130686304d4..87e282ab5c2 100644
--- a/spec/components/cooked_post_processor_spec.rb
+++ b/spec/components/cooked_post_processor_spec.rb
@@ -173,10 +173,10 @@ describe CookedPostProcessor do
 
   context ".extract_images" do
 
-    let(:post) { build(:post_with_images_in_quote_and_onebox) }
+    let(:post) { build(:post_with_plenty_of_images) }
     let(:cpp) { CookedPostProcessor.new(post) }
 
-    it "does not extract images inside oneboxes or quotes" do
+    it "does not extract emojis or images inside oneboxes or quotes" do
       expect(cpp.extract_images.length).to eq(0)
     end
 
diff --git a/spec/fabricators/post_fabricator.rb b/spec/fabricators/post_fabricator.rb
index cab02e02ed0..7628ee4ae3b 100644
--- a/spec/fabricators/post_fabricator.rb
+++ b/spec/fabricators/post_fabricator.rb
@@ -42,11 +42,12 @@ Fabricator(:reply, from: :post) do
   '
 end
 
-Fabricator(:post_with_images_in_quote_and_onebox, from: :post) do
+Fabricator(:post_with_plenty_of_images, from: :post) do
   cooked '
 <aside class="quote"><img src="/uploads/default/1/1234567890123456.jpg"></aside>
 <div class="onebox-result"><img src="/uploads/default/1/1234567890123456.jpg"></div>
 <div class="onebox"><img src="/uploads/default/1/1234567890123456.jpg"></div>
+<p>With an emoji! <img src="//cdn.discourse.org/meta/images/emoji/twitter/smile.png?v=0" title=":smile:" class="emoji" alt="smile" width="72" height="72"></p>
 '
 end