diff --git a/daemon/kdeconnectd.cpp b/daemon/kdeconnectd.cpp
index 8073a6c84..7c8560971 100644
--- a/daemon/kdeconnectd.cpp
+++ b/daemon/kdeconnectd.cpp
@@ -47,7 +47,7 @@ public:
         KNotification* notification = new KNotification(QStringLiteral("pairingRequest"));
         notification->setIconName(QStringLiteral("dialog-information"));
         notification->setComponentName(QStringLiteral("kdeconnect"));
-        notification->setText(i18n("Pairing request from %1", device->name()));
+        notification->setText(i18n("Pairing request from %1", device->name().toHtmlEscaped()));
         notification->setActions(QStringList() << i18n("Accept") << i18n("Reject"));
 //         notification->setTimeout(PairingHandler::pairingTimeoutMsec());
         connect(notification, &KNotification::action1Activated, device, &Device::acceptPairing);
diff --git a/kcm/kcm.ui b/kcm/kcm.ui
index bfe9fb7db..6a053100e 100644
--- a/kcm/kcm.ui
+++ b/kcm/kcm.ui
@@ -156,6 +156,9 @@
               <property name="text">
                <string>Device</string>
               </property>
+              <property name="textFormat">
+               <enum>Qt::PlainText</enum>
+              </property>
              </widget>
             </item>
             <item>
diff --git a/plasmoid/package/contents/ui/DeviceDelegate.qml b/plasmoid/package/contents/ui/DeviceDelegate.qml
index a42e5bb7d..244b8b770 100644
--- a/plasmoid/package/contents/ui/DeviceDelegate.qml
+++ b/plasmoid/package/contents/ui/DeviceDelegate.qml
@@ -102,6 +102,7 @@ PlasmaComponents.ListItem
                 elide: Text.ElideRight
                 text: display
                 Layout.fillWidth: true
+                textFormat: Text.PlainText
             }
 
             //Find my phone