1 files changed, 4 insertions, 1 deletions
diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb
index 3e2df7aafc..e47b303aa4 100644
--- a/lib/drb/drb.rb
+++ b/lib/drb/drb.rb
@@ -1678,7 +1678,10 @@ module DRb
             error_print(e) if verbose
           ensure
             client.close unless succ
-            shutdown if Thread.current['DRb']['stop_service']
+            if Thread.current['DRb']['stop_service']
+              shutdown
+              break
+            end
             break unless succ
           end
         end