diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/LiveRecipientCache.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/LiveRecipientCache.java
index ea4282ce9..ae4421e5a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/recipients/LiveRecipientCache.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/LiveRecipientCache.java
@@ -165,7 +165,7 @@ public final class LiveRecipientCache {
       }
 
       if (selfId == null) {
-        throw new MissingRecipientException(null);
+        selfId = recipientDatabase.getAndPossiblyMerge(localAci, localE164, false);
       }
 
       synchronized (localRecipientId) {