diff --git a/src/single_window/connection_status_window.cpp b/src/single_window/connection_status_window.cpp
index 42d5c66..7405a7c 100644
--- a/src/single_window/connection_status_window.cpp
+++ b/src/single_window/connection_status_window.cpp
@@ -159,6 +159,8 @@ int Render::ConnectionStatusWindow(
           ImGui::IsKeyPressed(ImGuiKey_Enter)) {
         show_connection_status_window_ = false;
         re_enter_remote_id_ = true;
+        DestroyPeer(&props->peer_);
+        client_properties_.erase(props->remote_id_);
       }
     }