diff --git a/src/ui/gui/appwindow.slint b/src/ui/gui/appwindow.slint
index 1606678a..c3eeed41 100644
--- a/src/ui/gui/appwindow.slint
+++ b/src/ui/gui/appwindow.slint
@@ -378,6 +378,9 @@ export component AppWindow inherits Window {
         NetplayData.password = "";
         NetplayData.session_name = "";
         NetplayWaitData.chat_text = "";
+        NetplayWaitData.input_delay = 0;
+        NetplayWaitData.recommended_delay = 0;
+        NetplayWaitData.players = [];
         NetplayData.pending_session = false;
         NetplayData.pending_refresh = false;
     }
diff --git a/src/ui/netplay.rs b/src/ui/netplay.rs
index 63b98e5e..8d11a7db 100644
--- a/src/ui/netplay.rs
+++ b/src/ui/netplay.rs
@@ -352,7 +352,11 @@ fn join_session(
     password: String,
 ) {
     let session = NetplaySession {
-        password: Some(password),
+        password: if password.is_empty() {
+            None
+        } else {
+            Some(password)
+        },
         game_name: None,
         motd: None,
         game_checksum: Some(game_hash),