diff --git a/lib/searchkick/query.rb b/lib/searchkick/query.rb
index 1a9495d..b83ee3e 100644
--- a/lib/searchkick/query.rb
+++ b/lib/searchkick/query.rb
@@ -580,8 +580,6 @@ module Searchkick
 
       if suggest.is_a?(Array)
         suggest_fields = suggest
-      elsif !klass
-        raise ArgumentError, "Must pass fields to suggest option"
       else
         suggest_fields = (searchkick_options[:suggest] || []).map(&:to_s)
 
@@ -600,6 +598,8 @@ module Searchkick
             }
           }
         end
+      else
+        raise ArgumentError, "Must pass fields to suggest option"
       end
     end
 
--
libgit2 0.21.0