1 files changed, 1 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/core.rb b/activerecord/lib/active_record/core.rb
index 82b9c79533..83859e474a 100644
--- a/activerecord/lib/active_record/core.rb
+++ b/activerecord/lib/active_record/core.rb
@@ -152,6 +152,7 @@ module ActiveRecord
 
       def find_by(*args)
         return super if current_scope || !(Hash === args.first) || reflect_on_all_aggregations.any?
+        return super if default_scopes.any?
 
         hash = args.first
 
@@ -182,8 +183,6 @@ module ActiveRecord
       end
 
       def initialize_generated_modules
-        super
-
         generated_association_methods
       end