diff --git a/config/initializers/active_record.rb b/config/initializers/active_record.rb
index 215c7808e8a..7ff84aaef2c 100644
--- a/config/initializers/active_record.rb
+++ b/config/initializers/active_record.rb
@@ -1073,6 +1073,16 @@ unless CANVAS_RAILS2
   ActiveRecord::Associations::CollectionProxy.class_eval do
     delegate :with_each_shard, :to => :scoped
   end
+
+  ActiveRecord::Associations::CollectionAssociation.class_eval do
+    def scoped
+      scope = super
+      proxy_association = self
+      scope.extending do
+        define_method(:proxy_association) { proxy_association }
+      end
+    end
+  end
 end
 
 ActiveRecord::ConnectionAdapters::AbstractAdapter.class_eval do