diff --git a/src/main/java/it/auties/whatsapp/socket/SocketHandler.java b/src/main/java/it/auties/whatsapp/socket/SocketHandler.java
index 53a1d42f..63c51757 100644
--- a/src/main/java/it/auties/whatsapp/socket/SocketHandler.java
+++ b/src/main/java/it/auties/whatsapp/socket/SocketHandler.java
@@ -716,8 +716,12 @@ public CompletableFuture<Void> sendReceipt(Jid jid, Jid participant, List<String
             return CompletableFuture.completedFuture(null);
         }
         
-        jid = jid.withAgent(null);
-        participant = participant.withAgent(null);
+        if (jid != null) {
+            jid = jid.withAgent(null);
+        }
+        if (participant != null) {
+            participant = participant.withAgent(null);
+        }
 
         var attributes = Attributes.of()
                 .put("id", messages.getFirst())