diff --git a/app/src/main/java/com/emanuelef/remote_capture/model/ConnectionDescriptor.java b/app/src/main/java/com/emanuelef/remote_capture/model/ConnectionDescriptor.java
index 942008eb..7dcc3655 100644
--- a/app/src/main/java/com/emanuelef/remote_capture/model/ConnectionDescriptor.java
+++ b/app/src/main/java/com/emanuelef/remote_capture/model/ConnectionDescriptor.java
@@ -182,7 +182,8 @@ public class ConnectionDescriptor {
             // triggered and payload disabled
             if(!CaptureService.isLowMemory()) {
                 synchronized (this) {
-                    payload_chunks.addAll(update.payload_chunks);
+                    if(update.payload_chunks != null)
+                        payload_chunks.addAll(update.payload_chunks);
                     payload_truncated = update.payload_truncated;
                 }
             }