diff --git a/activesupport/lib/active_support/core_ext/class/subclasses.rb b/activesupport/lib/active_support/core_ext/class/subclasses.rb
index 10a7c787f6..62397d9508 100644
--- a/activesupport/lib/active_support/core_ext/class/subclasses.rb
+++ b/activesupport/lib/active_support/core_ext/class/subclasses.rb
@@ -22,6 +22,7 @@ class Class
     def descendants
       descendants = []
       ObjectSpace.each_object(singleton_class) do |k|
+        next if k.singleton_class?
         descendants.unshift k unless k == self
       end
       descendants
diff --git a/activesupport/test/core_ext/class_test.rb b/activesupport/test/core_ext/class_test.rb
index a9c44907cc..a7905196ae 100644
--- a/activesupport/test/core_ext/class_test.rb
+++ b/activesupport/test/core_ext/class_test.rb
@@ -25,4 +25,14 @@ class ClassTest < ActiveSupport::TestCase
     assert_equal [Baz], Bar.subclasses
     assert_equal [], Baz.subclasses
   end
+
+  def test_descendants_excludes_singleton_classes
+    klass = Parent.new.singleton_class
+    refute Parent.descendants.include?(klass), "descendants should not include singleton classes"
+  end
+
+  def test_subclasses_excludes_singleton_classes
+    klass = Parent.new.singleton_class
+    refute Parent.subclasses.include?(klass), "subclasses should not include singleton classes"
+  end
 end