diff --git a/lib/query_helper.rb b/lib/query_helper.rb
index 0fc8d5f..a973f2b 100644
--- a/lib/query_helper.rb
+++ b/lib/query_helper.rb
@@ -171,7 +171,7 @@ def view_query
   def execute_query
     query = build_query()
     @results = @model.find_by_sql([query, @bind_variables]) # Execute Sql Query
-    @results = @results.first if @single_record # Return a single result if requested
+    @results = @single_record ? @results.first : @results
 
     determine_count()
     preload_associations()
@@ -250,16 +250,18 @@ def determine_count
     end
 
     def load_associations
-      @results = Associations.load_associations(
-        payload: @results,
+      result = Associations.load_associations(
+        payload: Array(@results),
         associations: @associations,
         as_json_options: @as_json_options
       )
+
+      @results = @single_record ? result.first : result
     end
 
     def preload_associations
       Associations.preload_associations(
-        payload: @results,
+        payload: Array(@results),
         preload: @preload
       )
     end