diff --git a/app/src/main/java/org/thoughtcrime/securesms/messages/protocol/BufferedSenderKeyStore.kt b/app/src/main/java/org/thoughtcrime/securesms/messages/protocol/BufferedSenderKeyStore.kt
index c63bde627c..a1167dd2d5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messages/protocol/BufferedSenderKeyStore.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/messages/protocol/BufferedSenderKeyStore.kt
@@ -60,10 +60,12 @@ class BufferedSenderKeyStore : SignalServiceSenderKeyStore {
       persistentStore.storeSenderKey(key.address, key.distributionId, record)
     }
 
-    persistentStore.clearSenderKeySharedWith(clearSharedWith)
+    if (clearSharedWith.isNotEmpty()) {
+      persistentStore.clearSenderKeySharedWith(clearSharedWith)
+      clearSharedWith.clear()
+    }
 
     updatedKeys.clear()
-    clearSharedWith.clear()
   }
 
   private fun UUID.toDistributionId() = DistributionId.from(this)