diff --git a/core/backends/lan/lanlinkprovider.cpp b/core/backends/lan/lanlinkprovider.cpp

index 770e7866addc84080be8f2b638bcbb9b6a29b9d0..6afb8552ca4db26e2f915b709aa26fa43e26ecae 100644

--- a/core/backends/lan/lanlinkprovider.cpp

+++ b/core/backends/lan/lanlinkprovider.cpp

@@ -47,6 +47,7 @@

 #define MIN_VERSION_WITH_SSL_SUPPORT 6

 static const int MAX_UNPAIRED_CONNECTIONS = 42;

+static const int MAX_REMEMBERED_IDENTITY_PACKETS = 42;

 LanLinkProvider::LanLinkProvider(

         bool testMode,

@@ -225,6 +226,12 @@ void LanLinkProvider::udpBroadcastReceived()

         //qCDebug(KDECONNECT_CORE) << "Received Udp identity packet from" << sender << " asking for a tcp connection on port " << tcpPort;

+        if (m_receivedIdentityPackets.size() > MAX_REMEMBERED_IDENTITY_PACKETS) {

+            qCWarning(KDECONNECT_CORE) << "Too many remembered identities, ignoring" << receivedPacket->get<QString>(QStringLiteral("deviceId")) << "received via UDP";

+            delete receivedPacket;

+            continue;

+        }

+

         QSslSocket* socket = new QSslSocket(this);

         socket->setProxy(QNetworkProxy::NoProxy);

         m_receivedIdentityPackets[socket].np = receivedPacket;

@@ -435,6 +442,12 @@ void LanLinkProvider::dataReceived()

         return;

     }

+    if (m_receivedIdentityPackets.size() > MAX_REMEMBERED_IDENTITY_PACKETS) {

+        qCWarning(KDECONNECT_CORE) << "Too many remembered identities, ignoring" << np->get<QString>(QStringLiteral("deviceId")) << "received via TCP";

+        delete np;

+        return;

+    }

+

     // Needed in "encrypted" if ssl is used, similar to "tcpSocketConnected"

     m_receivedIdentityPackets[socket].np = np;