diff --git a/plugin.rb b/plugin.rb
index e14b2ff..5623a79 100644
--- a/plugin.rb
+++ b/plugin.rb
@@ -1181,11 +1181,9 @@ SQL
 
       opts[:limit] =
         if params[:limit]
-          params[:limit].to_i
+          params[:limit] == "ALL" ? "ALL" : params[:limit].to_i
         elsif params[:format] == "csv"
           DataExplorer::QUERY_RESULT_MAX_LIMIT
-        elsif params[:limit] == "ALL"
-          "ALL"
         end
 
       result = DataExplorer.run_query(query, query_params, opts)