diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.kt
index 1a3d6eb7f9..f825a518e1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.kt
@@ -2399,18 +2399,7 @@ open class RecipientDatabase(context: Context, databaseHelper: SignalDatabase) :
             .run()
         }
         is PnpOperation.Merge -> {
-          val primary = getRecord(operation.primaryId)
-          val secondary = getRecord(operation.secondaryId)
-
-          if (primary.serviceId != null && !primary.sidIsPni() && secondary.e164 != null) {
-            merge(operation.primaryId, operation.secondaryId, inputPni)
-          } else {
-            if (!pnpEnabled) {
-              throw AssertionError("This type of merge is not supported in production!")
-            }
-
-            merge(operation.primaryId, operation.secondaryId, inputPni)
-          }
+          merge(operation.primaryId, operation.secondaryId, inputPni)
         }
         is PnpOperation.SessionSwitchoverInsert -> {
           // TODO [pnp]