diff --git a/src/network/network_server.cpp b/src/network/network_server.cpp
index cd1fd0c1cf..1ed4031ce8 100644
--- a/src/network/network_server.cpp
+++ b/src/network/network_server.cpp
@@ -989,6 +989,12 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_QUIT)
 		}
 	}
 
+	/* First tell we already closed the connection...
+	 * ... then start the generic code to close the actual connection.
+	 * This to make sure the 'connection lost' message is only shown
+	 * when the connection got really lost and not when the client
+	 * told us it was going to disconnect. */
+	cs->NetworkSocketHandler::CloseConnection();
 	cs->CloseConnection();
 }