diff --git a/lib/blather_notify.rb b/lib/blather_notify.rb
index da5c46bdd0c9b821c174a20561fd5ae8429edf5b..754e3db7a8bf4e8956706701c408d784e882959a 100644
--- a/lib/blather_notify.rb
+++ b/lib/blather_notify.rb
@@ -27,8 +27,9 @@ module BlatherNotify
 	end
 
 	def self.wait_then_exit
-		shutdown
 		disconnected { EM.stop }
+		EM.add_timer(30) { EM.stop }
+		shutdown
 		@thread.join
 	end
 end