diff --git a/examples/network/network-chat/client.cpp b/examples/network/network-chat/client.cpp
index 495ae90d023..c637224127e 100644
--- a/examples/network/network-chat/client.cpp
+++ b/examples/network/network-chat/client.cpp
@@ -45,10 +45,9 @@ bool Client::hasConnection(const QByteArray &peerUniqueId) const
 void Client::newConnection(Connection *connection)
 {
     connection->setGreetingMessage(peerManager->userName(), peerManager->uniqueId());
-
-    connect(connection, &Connection::errorOccurred, this, &Client::connectionError);
-    connect(connection, &Connection::disconnected, this, &Client::disconnected);
     connect(connection, &Connection::readyForUse, this, &Client::readyForUse);
+    connect(connection, &Connection::errorOccurred, connection, &QObject::deleteLater);
+    connect(connection, &Connection::disconnected, connection, &QObject::deleteLater);
 }
 
 void Client::readyForUse()
@@ -62,8 +61,9 @@ void Client::readyForUse()
         return;
     }
 
-    connect(connection,  &Connection::newMessage,
-            this, &Client::newMessage);
+    connect(connection, &Connection::errorOccurred, this, &Client::connectionError);
+    connect(connection, &Connection::disconnected, this, &Client::disconnected);
+    connect(connection, &Connection::newMessage, this, &Client::newMessage);
 
     peers.insert(connection->uniqueId(), connection);
     QString nick = connection->name();
@@ -85,7 +85,7 @@ void Client::connectionError(QAbstractSocket::SocketError /* socketError */)
 
 void Client::removeConnection(Connection *connection)
 {
-    if (peers.remove(connection->uniqueId(), connection) > 0) {
+    if (peers.remove(connection->uniqueId())) {
         QString nick = connection->name();
         if (!nick.isEmpty())
             emit participantLeft(nick);
diff --git a/examples/network/network-chat/client.h b/examples/network/network-chat/client.h
index 2ce6afe8269..a09d0c21f66 100644
--- a/examples/network/network-chat/client.h
+++ b/examples/network/network-chat/client.h
@@ -39,7 +39,7 @@ private:
 
     PeerManager *peerManager;
     Server server;
-    QMultiHash<QByteArray, Connection *> peers;
+    QHash<QByteArray, Connection *> peers;
 };
 
 #endif