diff --git a/lib/searchkick/reindex.rb b/lib/searchkick/reindex.rb
index f61adf7..1bde6a5 100644
--- a/lib/searchkick/reindex.rb
+++ b/lib/searchkick/reindex.rb
@@ -83,7 +83,7 @@ module Searchkick
             searchkick_suggest_index: {
               type: "custom",
               tokenizer: "standard",
-              filter: ["lowercase", "asciifolding", "shingle"]
+              filter: ["lowercase", "asciifolding", "searchkick_suggest_shingle"]
             }
           },
           filter: {
@@ -97,6 +97,10 @@ module Searchkick
               token_separator: "",
               output_unigrams: false,
               output_unigrams_if_no_shingles: true
+            },
+            searchkick_suggest_shingle: {
+              type: "shingle",
+              max_shingle_size: 5
             }
           },
           tokenizer: {
diff --git a/test/suggest_test.rb b/test/suggest_test.rb
index 0a5b756..59d7754 100644
--- a/test/suggest_test.rb
+++ b/test/suggest_test.rb
@@ -13,8 +13,8 @@ class TestSuggest < Minitest::Unit::TestCase
   end
 
   def test_phrase
-    store_names ["Tiger Shark", "Sharp Teeth", "Sharp Mind"]
-    assert_suggest "How to catch a tiger shar", "how to catch a tiger shark"
+    store_names ["Big Tiger Shark", "Tiger Sharp Teeth", "Tiger Sharp Mind"]
+    assert_suggest "How to catch a big tiger shar", "how to catch a big tiger shark"
   end
 
   def test_without_option
--
libgit2 0.21.0