diff --git a/lib/dm-core/query.rb b/lib/dm-core/query.rb
index f56cad9f4..864eb4b91 100644
--- a/lib/dm-core/query.rb
+++ b/lib/dm-core/query.rb
@@ -787,10 +787,10 @@ def assert_valid_fields(fields, unique)
 
       model = self.model
 
-      valid_properties = model.properties
+      valid_properties = model.properties(model.repository)
 
       model.descendants.each do |descendant|
-        valid_properties += descendant.properties
+        valid_properties += descendant.properties(descendant.repository)
       end
 
       fields.each do |field|