diff --git a/activesupport/lib/active_support/core_ext/string/iterators.rb b/activesupport/lib/active_support/core_ext/string/iterators.rb
index 66a08a5cd0..fe17d140ca 100644
--- a/activesupport/lib/active_support/core_ext/string/iterators.rb
+++ b/activesupport/lib/active_support/core_ext/string/iterators.rb
@@ -13,7 +13,9 @@ module ActiveSupport #:nodoc:
         # When $KCODE = 'UTF8', multi-byte characters are yielded appropriately.
         def each_char
           scanner, char = StringScanner.new(self), /./mu
-          loop { yield(scanner.scan(char) || break) }
+          while c = scanner.scan(char)
+            yield c
+          end
         end
       end
     end