diff --git a/lib/action_cable/subscription_adapter/solid_cable.rb b/lib/action_cable/subscription_adapter/solid_cable.rb
index 65944aa..290c128 100644
--- a/lib/action_cable/subscription_adapter/solid_cable.rb
+++ b/lib/action_cable/subscription_adapter/solid_cable.rb
@@ -59,7 +59,7 @@ def listen
 
           def shutdown
             self.running = false
-            Thread.pass while thread.alive?
+            thread.join
           end
 
           def add_channel(channel, on_success)