diff --git a/yaboli/room.py b/yaboli/room.py
index 75201d9..e9bcc35 100644
--- a/yaboli/room.py
+++ b/yaboli/room.py
@@ -354,6 +354,8 @@ class Room():
 		
 		if self.password is not None:
 			self.authenticate(self.password)
+		else:
+			self.stop()
 	
 	def _handle_disconnect_event(self, data):
 		"""