diff --git a/src/Devices/OWSContactsOutputStream.h b/src/Devices/OWSContactsOutputStream.h
index 298fcdb10..41717aafc 100644
--- a/src/Devices/OWSContactsOutputStream.h
+++ b/src/Devices/OWSContactsOutputStream.h
@@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN
 @interface OWSContactsOutputStream : OWSChunkedOutputStream
 
 - (void)writeSignalAccount:(SignalAccount *)signalAccount
-         recipientIdentity:(OWSRecipientIdentity *)recipientIdentity;
+         recipientIdentity:(nullable OWSRecipientIdentity *)recipientIdentity;
 
 @end
 
diff --git a/src/Devices/OWSContactsOutputStream.m b/src/Devices/OWSContactsOutputStream.m
index 96ce8ba83..dc3c773db 100644
--- a/src/Devices/OWSContactsOutputStream.m
+++ b/src/Devices/OWSContactsOutputStream.m
@@ -15,21 +15,22 @@ NS_ASSUME_NONNULL_BEGIN
 @implementation OWSContactsOutputStream
 
 - (void)writeSignalAccount:(SignalAccount *)signalAccount
-         recipientIdentity:(OWSRecipientIdentity *)recipientIdentity
+         recipientIdentity:(nullable OWSRecipientIdentity *)recipientIdentity
 {
     OWSAssert(signalAccount);
     OWSAssert(signalAccount.contact);
-    OWSAssert(recipientIdentity);
 
     OWSSignalServiceProtosContactDetailsBuilder *contactBuilder = [OWSSignalServiceProtosContactDetailsBuilder new];
     [contactBuilder setName:signalAccount.contact.fullName];
     [contactBuilder setNumber:signalAccount.recipientId];
 
-    OWSSignalServiceProtosVerifiedBuilder *verifiedBuilder = [OWSSignalServiceProtosVerifiedBuilder new];
-    verifiedBuilder.destination = recipientIdentity.recipientId;
-    verifiedBuilder.identityKey = recipientIdentity.identityKey;
-    verifiedBuilder.state = OWSVerificationStateToProtoState(recipientIdentity.verificationState);
-    contactBuilder.verified = [verifiedBuilder build];
+    if (recipientIdentity != nil) {
+        OWSSignalServiceProtosVerifiedBuilder *verifiedBuilder = [OWSSignalServiceProtosVerifiedBuilder new];
+        verifiedBuilder.destination = recipientIdentity.recipientId;
+        verifiedBuilder.identityKey = recipientIdentity.identityKey;
+        verifiedBuilder.state = OWSVerificationStateToProtoState(recipientIdentity.verificationState);
+        contactBuilder.verifiedBuilder = verifiedBuilder;
+    }
 
     NSData *avatarPng;
     if (signalAccount.contact.image) {