diff --git a/src/base/TcpSocketHandler.cpp b/src/base/TcpSocketHandler.cpp
index 26e0280d0..3fc87020d 100644
--- a/src/base/TcpSocketHandler.cpp
+++ b/src/base/TcpSocketHandler.cpp
@@ -240,6 +240,7 @@ void TcpSocketHandler::stopListening(const SocketEndpoint &endpoint) {
   for (int sockFd : serverSockets) {
     close(sockFd);
   }
+  portServerSockets.erase(it);
 }
 
 void TcpSocketHandler::initSocket(int fd) {