diff --git a/core/backends/lan/lanlinkprovider.cpp b/core/backends/lan/lanlinkprovider.cpp
index 66ba29251..8b4793e52 100644
--- a/core/backends/lan/lanlinkprovider.cpp
+++ b/core/backends/lan/lanlinkprovider.cpp
@@ -33,6 +33,7 @@
 #include <QUdpSocket>
 
 #include "daemon.h"
+#include "dbushelper.h"
 #include "kdeconnectconfig.h"
 #include "landevicelink.h"
 
@@ -606,6 +607,7 @@ void LanLinkProvider::configureSocket(QSslSocket *socket)
 void LanLinkProvider::addLink(QSslSocket *socket, const DeviceInfo &deviceInfo)
 {
     QString certDeviceId = socket->peerCertificate().subjectDisplayName();
+    DBusHelper::filterNonExportableCharacters(certDeviceId);
     if (deviceInfo.id != certDeviceId) {
         socket->disconnectFromHost();
         qCWarning(KDECONNECT_CORE) << "DeviceID in cert doesn't match deviceID in identity packet. " << deviceInfo.id << " vs " << certDeviceId;