1 files changed, 4 insertions, 6 deletions
diff --git a/activerecord/lib/active_record/associations/join_dependency/join_association.rb b/activerecord/lib/active_record/associations/join_dependency/join_association.rb
index 84e18684d8..0cd2e1a816 100644
--- a/activerecord/lib/active_record/associations/join_dependency/join_association.rb
+++ b/activerecord/lib/active_record/associations/join_dependency/join_association.rb
@@ -52,18 +52,16 @@ module ActiveRecord
               end
             end
 
-            if reflection.type
-              scope_chain_items <<
-                ActiveRecord::Relation.create(klass, table)
-                  .where(reflection.type => foreign_klass.base_class.name)
-            end
-
             scope_chain_items.concat [klass.send(:build_default_scope)].compact
 
             rel = scope_chain_items.inject(scope_chain_items.shift) do |left, right|
               left.merge right
             end
 
+            if reflection.type
+              constraint = constraint.and table[reflection.type].eq foreign_klass.base_class.name
+            end
+
             if rel && !rel.arel.constraints.empty?
               constraint = constraint.and rel.arel.constraints
             end