1 files changed, 1 insertions, 1 deletions
diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb
index a2c11f980d..4712306fe0 100644
--- a/lib/drb/drb.rb
+++ b/lib/drb/drb.rb
@@ -1394,7 +1394,7 @@ module DRb
       if  Thread.current['DRb'] && Thread.current['DRb']['server'] == self
         Thread.current['DRb']['stop_service'] = true
       else
-        @thread.kill
+        @thread.kill.join
       end
     end