diff --git a/spec/integration/admin/emojis_spec.rb b/spec/integration/admin/emojis_spec.rb
index 5ea92ea6f3d..c0d72fcdfb4 100644
--- a/spec/integration/admin/emojis_spec.rb
+++ b/spec/integration/admin/emojis_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe "Managing custom emojis" do
             name: 'test',
             file: fixture_file_upload("#{Rails.root}/spec/fixtures/images/fake.jpg")
           })
-        end.first
+        end.find{|m| m.channel == "/uploads/emoji"}
 
         expect(message.channel).to eq("/uploads/emoji")
         expect(message.data["errors"]).to eq([I18n.t('upload.images.size_not_found')])
@@ -32,7 +32,7 @@ RSpec.describe "Managing custom emojis" do
             name: 'test',
             file: fixture_file_upload("#{Rails.root}/spec/fixtures/images/logo.png")
           })
-        end.first
+        end.find{|m| m.channel == "/uploads/emoji"}
 
         expect(message.channel).to eq("/uploads/emoji")
 
@@ -50,7 +50,7 @@ RSpec.describe "Managing custom emojis" do
             name: 'test',
             file: fixture_file_upload("#{Rails.root}/spec/fixtures/images/logo.png")
           })
-        end.first
+        end.find{|m| m.channel == "/uploads/emoji"}
 
         custom_emoji = CustomEmoji.last
         upload = custom_emoji.upload