diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt
index 95cc140329..9a1a96812a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt
@@ -2248,7 +2248,10 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
    */
   fun splitForStorageSync(storageId: ByteArray) {
     val record = getByStorageId(storageId)!!
-    check(record.aci != null && record.pni != null)
+    if (record.aci == null || record.pni == null) {
+      Log.w(TAG, "Invalid state for split, ignoring.")
+      return
+    }
 
     writableDatabase
       .update(TABLE_NAME)