diff --git a/activesupport/lib/active_support/core_ext/class/removal.rb b/activesupport/lib/active_support/core_ext/class/removal.rb
index 42cb9f6e4e505ef6db3c5cffb8b1c72007839feb..628781669d5fdb2c983d384f938c112aa29facdc 100644
--- a/activesupport/lib/active_support/core_ext/class/removal.rb
+++ b/activesupport/lib/active_support/core_ext/class/removal.rb
@@ -11,12 +11,12 @@ def remove_class(*klasses)
     klasses.each do |klass|
       # Skip this class if there is nothing bound to this name
       next unless defined?(klass.name)
-      
+    
       basename = klass.to_s.split("::").last
       parent = klass.parent
-      
+    
       # Skip this class if it does not match the current one bound to this name
-      next unless klass = parent.const_get(basename)
+      next unless parent.const_defined?(basename) && klass = parent.const_get(basename)
 
       parent.send :remove_const, basename unless parent == klass
     end