diff --git a/ruf-der-pilze/scripts/tavern.gd b/ruf-der-pilze/scripts/tavern.gd
index 437f160..6c7c3c4 100644
--- a/ruf-der-pilze/scripts/tavern.gd
+++ b/ruf-der-pilze/scripts/tavern.gd
@@ -34,10 +34,20 @@ func _on_connected() -> void:
 	$CanvasLayer/WaitPanel/StartButton.visible = (_local_role == "dm")
 
 
+func _exit_tree() -> void:
+	NetworkManager.connected_to_server.disconnect(_on_connected)
+	NetworkManager.connection_failed.disconnect(_on_connection_failed)
+	NetworkManager.player_joined.disconnect(_on_player_joined)
+	NetworkManager.player_left.disconnect(_on_player_left)
+	NetworkManager.player_list_synced.disconnect(_rebuild_player_list)
+
+
 func _on_connection_failed() -> void:
 	push_error("[Tavern] Verbindung fehlgeschlagen")
 	_local_role = ""
 	_pending_player_name = ""
+	$CanvasLayer/JoinPanel.visible = true
+	$CanvasLayer/WaitPanel.visible = false
 
 
 func _on_player_joined(_peer_id: int, _player_name: String, _role: String) -> void: