2 files changed, 18 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/preloader/through_association.rb b/activerecord/lib/active_record/associations/preloader/through_association.rb
index 5bd49b041a..b16fca7dc9 100644
--- a/activerecord/lib/active_record/associations/preloader/through_association.rb
+++ b/activerecord/lib/active_record/associations/preloader/through_association.rb
@@ -40,7 +40,11 @@ module ActiveRecord
 
           middle_records = through_records.flat_map(&:last)
 
-          reflection_scope = reflection_scope() if reflection.scope
+          if preload_scope
+            reflection_scope = reflection_scope().merge(preload_scope)
+          elsif reflection.scope
+            reflection_scope = reflection_scope()
+          end
 
           preloaders = preloader.preload(middle_records,
                                          source_reflection.name,
@@ -70,6 +74,8 @@ module ActiveRecord
                 rhs_records
               end
             end
+          end.tap do
+            reset_association(middle_records, source_reflection.name, preload_scope)
           end
         end
 
diff --git a/activerecord/test/cases/associations/nested_through_associations_test.rb b/activerecord/test/cases/associations/nested_through_associations_test.rb
index 11ee45917f..65d30d011b 100644
--- a/activerecord/test/cases/associations/nested_through_associations_test.rb
+++ b/activerecord/test/cases/associations/nested_through_associations_test.rb
@@ -579,6 +579,17 @@ class NestedThroughAssociationsTest < ActiveRecord::TestCase
     assert !c.post_taggings.empty?
   end
 
+  def test_polymorphic_has_many_through_when_through_association_has_not_loaded
+    cake_designer = CakeDesigner.create!(chef: Chef.new)
+    drink_designer = DrinkDesigner.create!(chef: Chef.new)
+    department = Department.create!(chefs: [cake_designer.chef, drink_designer.chef])
+    Hotel.create!(departments: [department])
+    hotel = Hotel.includes(:cake_designers, :drink_designers).take
+
+    assert_equal [cake_designer], hotel.cake_designers
+    assert_equal [drink_designer], hotel.drink_designers
+  end
+
   def test_polymorphic_has_many_through_when_through_association_has_already_loaded
     cake_designer = CakeDesigner.create!(chef: Chef.new)
     drink_designer = DrinkDesigner.create!(chef: Chef.new)