diff --git a/app/src/main/java/org/thoughtcrime/securesms/messages/DataMessageProcessor.kt b/app/src/main/java/org/thoughtcrime/securesms/messages/DataMessageProcessor.kt
index 0747ba02b8..b3b09eccdf 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messages/DataMessageProcessor.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/messages/DataMessageProcessor.kt
@@ -1327,6 +1327,9 @@ object DataMessageProcessor {
 
     return if (insertResult != null) {
       log(envelope.timestamp!!, "Inserted a pinned message update at ${insertResult.messageId}")
+      if (duration != MessageTable.PIN_FOREVER) {
+        AppDependencies.pinnedMessageManager.scheduleIfNecessary()
+      }
       insertResult
     } else {
       null