diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
index 04eeea91..9caac144 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
@@ -279,11 +279,13 @@ public class RecipientStore implements RecipientResolver, ContactsStore, Profile
         synchronized (recipients) {
             logger.debug("Deleting recipient data for {}", recipientId);
             final var recipient = recipients.get(recipientId);
-            storeRecipientLocked(recipientId,
-                    Recipient.newBuilder()
-                            .withRecipientId(recipientId)
-                            .withAddress(new RecipientAddress(recipient.getAddress().uuid().orElse(null)))
-                            .build());
+            recipient.getAddress()
+                    .uuid()
+                    .ifPresent(uuid -> storeRecipientLocked(recipientId,
+                            Recipient.newBuilder()
+                                    .withRecipientId(recipientId)
+                                    .withAddress(new RecipientAddress(uuid))
+                                    .build()));
         }
     }