diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SignalDatabaseMigrations.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SignalDatabaseMigrations.kt
index 4e85da339..dc2d074d1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SignalDatabaseMigrations.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SignalDatabaseMigrations.kt
@@ -182,8 +182,9 @@ object SignalDatabaseMigrations {
   private const val NOTIFICATION_PROFILES_END_FIX = 124
   private const val REACTION_BACKUP_CLEANUP = 125
   private const val REACTION_REMOTE_DELETE_CLEANUP = 126
+  private const val PNI_CLEANUP = 127
 
-  const val DATABASE_VERSION = 126
+  const val DATABASE_VERSION = 127
 
   @JvmStatic
   fun migrate(context: Context, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) {
@@ -2258,6 +2259,10 @@ object SignalDatabaseMigrations {
         """.trimIndent()
       )
     }
+
+    if (oldVersion < PNI_CLEANUP) {
+      db.execSQL("UPDATE recipient SET pni = NULL WHERE phone IS NULL")
+    }
   }
 
   @JvmStatic