diff --git a/lib/searchkick/query.rb b/lib/searchkick/query.rb
index 1226f83..96a41f5 100644
--- a/lib/searchkick/query.rb
+++ b/lib/searchkick/query.rb
@@ -25,7 +25,7 @@ module Searchkick
       term = term.to_s
 
       if options[:emoji]
-        term = EmojiParser.parse_unicode(term) { |e| " #{e.name} " }.strip
+        term = EmojiParser.parse_unicode(term) { |e| " #{e.name.tr('_', ' ')} " }.strip
       end
 
       @klass = klass
diff --git a/test/match_test.rb b/test/match_test.rb
index fdec586..2b548c8 100644
--- a/test/match_test.rb
+++ b/test/match_test.rb
@@ -254,6 +254,7 @@ class MatchTest < Minitest::Test
   def test_emoji_multiple
     store_names ["Ice Cream Cake"]
     assert_search "🍨🍰", ["Ice Cream Cake"], emoji: true
+    assert_search "🍨🍰", ["Ice Cream Cake"], emoji: true, misspellings: false
   end
 
   # operator
--
libgit2 0.21.0