diff --git a/src/org/kde/kdeconnect/Backends/LanBackend/LanLink.java b/src/org/kde/kdeconnect/Backends/LanBackend/LanLink.java
--- a/src/org/kde/kdeconnect/Backends/LanBackend/LanLink.java
+++ b/src/org/kde/kdeconnect/Backends/LanBackend/LanLink.java
@@ -150,7 +150,7 @@
 
             //Prepare socket for the payload
             final ServerSocket server;
-            if (np.hasPayload() && np.getPayloadSize() != 0) {
+            if (np.hasPayload()) {
                 server = LanLinkProvider.openServerSocketOnFreePort(LanLinkProvider.PAYLOAD_TRANSFER_MIN_PORT);
                 JSONObject payloadTransferInfo = new JSONObject();
                 payloadTransferInfo.put("port", server.getLocalPort());
@@ -263,7 +263,6 @@
         }
 
         if (np.hasPayloadTransferInfo()) {
-
             Socket payloadSocket = new Socket();
             try {
                 int tcpPort = np.getPayloadTransferInfo().getInt("port");
diff --git a/src/org/kde/kdeconnect/NetworkPacket.java b/src/org/kde/kdeconnect/NetworkPacket.java
--- a/src/org/kde/kdeconnect/NetworkPacket.java
+++ b/src/org/kde/kdeconnect/NetworkPacket.java
@@ -309,7 +309,7 @@
     }
 
     public boolean hasPayload() {
-        return (mPayload != null);
+        return (mPayloadSize != 0);
     }
 
     public boolean hasPayloadTransferInfo() {