1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/associations/through_association_scope.rb b/activerecord/lib/active_record/associations/through_association_scope.rb
index fa84de533f..415fc53e1c 100644
--- a/activerecord/lib/active_record/associations/through_association_scope.rb
+++ b/activerecord/lib/active_record/associations/through_association_scope.rb
@@ -73,9 +73,9 @@ module ActiveRecord
         end
       end
 
-      def construct_select(custom_select = nil)
-        distinct = "DISTINCT #{@reflection.quoted_table_name}.*" if @reflection.options[:uniq]
-        custom_select || @reflection.options[:select] || distinct
+      def construct_select
+        @reflection.options[:select] ||
+        @reflection.options[:uniq] && "DISTINCT #{@reflection.quoted_table_name}.*"
       end
 
       def construct_joins