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 31a5a963..6a672008 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
@@ -917,7 +917,10 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                     final var recipientId = recipientAddress.get().id();
                     markDiscoverable(connection, recipientId, false);
                     final var contact = getContact(connection, recipientId);
-                    if (recipientAddress.get().address().aci().isEmpty() || contact.unregisteredTimestamp() != null) {
+                    if (recipientAddress.get().address().aci().isEmpty() || (
+                            contact != null
+                                    && contact.unregisteredTimestamp() != null
+                    )) {
                         markUnregisteredAndSplitIfNecessary(connection, recipientId);
                     }
                 }