3 files changed, 9 insertions, 9 deletions
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb
index 2cf19c76c5..6728443251 100644
--- a/activerecord/lib/active_record/relation.rb
+++ b/activerecord/lib/active_record/relation.rb
@@ -271,12 +271,7 @@ module ActiveRecord
     def empty?
       return @records.empty? if loaded?
 
-      if limit_value == 0
-        true
-      else
-        c = count(:all)
-        c.respond_to?(:zero?) ? c.zero? : c.empty?
-      end
+      limit_value == 0 || !exists?
     end
 
     # Returns true if there are no records.
diff --git a/activerecord/lib/active_record/relation/finder_methods.rb b/activerecord/lib/active_record/relation/finder_methods.rb
index 435cef901b..b83032e2a0 100644
--- a/activerecord/lib/active_record/relation/finder_methods.rb
+++ b/activerecord/lib/active_record/relation/finder_methods.rb
@@ -280,8 +280,8 @@ module ActiveRecord
 
       return false if !conditions
 
-      relation = apply_join_dependency(self, construct_join_dependency)
-      return false if ActiveRecord::NullRelation === relation
+      relation = apply_join_dependency(self, construct_join_dependency_for_exists)
+      return false if ActiveRecord::NullRelation === relation || limit_value == 0
 
       relation = relation.except(:select, :order).select(ONE_AS_ONE).limit(1)
 
@@ -359,6 +359,11 @@ module ActiveRecord
       ActiveRecord::Associations::JoinDependency.new(@klass, including, joins)
     end
 
+    def construct_join_dependency_for_exists
+      including = (eager_load_values + includes_values) & references_values.map(&:to_sym)
+      ActiveRecord::Associations::JoinDependency.new(@klass, including, [])
+    end
+
     def construct_relation_for_association_calculations
       from = arel.froms.first
       if Arel::Table === from
diff --git a/activerecord/test/cases/locking_test.rb b/activerecord/test/cases/locking_test.rb
index 2e1363334d..4fe76e563a 100644
--- a/activerecord/test/cases/locking_test.rb
+++ b/activerecord/test/cases/locking_test.rb
@@ -441,7 +441,7 @@ unless in_memory_db?
       def test_lock_sending_custom_lock_statement
         Person.transaction do
           person = Person.find(1)
-          assert_sql(/LIMIT 1 FOR SHARE NOWAIT/) do
+          assert_sql(/LIMIT \$\d FOR SHARE NOWAIT/) do
             person.lock!('FOR SHARE NOWAIT')
           end
         end