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 b01c343b7..d87614648 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt
@@ -2061,6 +2061,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
 
       if (update(id, contentValuesOf(USERNAME to username))) {
         ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+        rotateStorageId(id)
         StorageSyncHelper.scheduleSyncForDataChange()
       }
     }
@@ -2068,6 +2069,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
 
   fun setHideStory(id: RecipientId, hideStory: Boolean) {
     updateExtras(id) { it.setHideStory(hideStory) }
+    rotateStorageId(id)
     StorageSyncHelper.scheduleSyncForDataChange()
   }