diff --git a/lib/scheduler/manager.rb b/lib/scheduler/manager.rb
index 3cbff459a44..0543c4af2e0 100644
--- a/lib/scheduler/manager.rb
+++ b/lib/scheduler/manager.rb
@@ -137,6 +137,8 @@ module Scheduler
             sleep 5
             @thread.kill
           end
+
+          @thread.join
         end
       end