diff --git a/src/rttys/RTTYS_server.cpp b/src/rttys/RTTYS_server.cpp
index 97e559b3..0a178fbd 100644
--- a/src/rttys/RTTYS_server.cpp
+++ b/src/rttys/RTTYS_server.cpp
@@ -848,7 +848,9 @@ namespace OpenWifi {
 				Connected_.erase(hint);
 				EndPoints_.erase(id);
 			} else {
-				EndPoints_.erase(hint->second->Id_);
+				auto id = hint->second->Id_;
+				Connected_.erase(hint);
+				EndPoints_.erase(id);
 			}
 		}