diff --git a/src/org/kde/kdeconnect/Device.java b/src/org/kde/kdeconnect/Device.java
index 31f02a6c..b01089bd 100644
--- a/src/org/kde/kdeconnect/Device.java
+++ b/src/org/kde/kdeconnect/Device.java
@@ -360,7 +360,11 @@ public class Device implements BaseLink.PacketReceiver {
 
         if (deviceInfo.outgoingCapabilities != newDeviceInfo.outgoingCapabilities ||
                 deviceInfo.incomingCapabilities != newDeviceInfo.incomingCapabilities) {
-            if (newDeviceInfo.outgoingCapabilities != null && newDeviceInfo.incomingCapabilities != null) {
+            if (newDeviceInfo.outgoingCapabilities != null
+                    && !newDeviceInfo.outgoingCapabilities.isEmpty()
+                    && newDeviceInfo.incomingCapabilities != null
+                    && !newDeviceInfo.incomingCapabilities.isEmpty()
+            ) {
                 hasChanges = true;
                 Log.i("updateDeviceInfo", "Updating supported plugins according to new capabilities");
                 supportedPlugins = new Vector<>(PluginFactory.pluginsForCapabilities(newDeviceInfo.incomingCapabilities, newDeviceInfo.outgoingCapabilities));