diff --git a/src/base/http/server.cpp b/src/base/http/server.cpp
index 8dcf3174c..8fb01e655 100644
--- a/src/base/http/server.cpp
+++ b/src/base/http/server.cpp
@@ -107,19 +107,19 @@ void Server::incomingConnection(const qintptr socketDescriptor)
     }
 
     auto *c = new Connection(serverSocket, m_requestHandler, this);
-    m_connections.append(c);
+    m_connections.insert(c);
     connect(serverSocket, &QAbstractSocket::disconnected, this, [c, this]() { removeConnection(c); });
 }
 
 void Server::removeConnection(Connection *connection)
 {
-    m_connections.removeOne(connection);
+    m_connections.remove(connection);
     connection->deleteLater();
 }
 
 void Server::dropTimedOutConnection()
 {
-    QMutableListIterator<Connection *> i(m_connections);
+    QMutableSetIterator<Connection *> i(m_connections);
     while (i.hasNext()) {
         Connection *connection = i.next();
         if (connection->hasExpired(KEEP_ALIVE_DURATION)) {
diff --git a/src/base/http/server.h b/src/base/http/server.h
index 415e905ac..e0433f96c 100644
--- a/src/base/http/server.h
+++ b/src/base/http/server.h
@@ -31,6 +31,7 @@
 #ifndef HTTP_SERVER_H
 #define HTTP_SERVER_H
 
+#include <QSet>
 #include <QSslCertificate>
 #include <QSslKey>
 #include <QTcpServer>
@@ -59,7 +60,7 @@ namespace Http
         void removeConnection(Connection *connection);
 
         IRequestHandler *m_requestHandler;
-        QList<Connection *> m_connections;  // for tracking persistent connections
+        QSet<Connection *> m_connections;  // for tracking persistent connections
 
         bool m_https;
         QList<QSslCertificate> m_certificates;