diff --git a/Signal/src/ViewControllers/ConversationView/CV/CVAudioPlayback.swift b/Signal/src/ViewControllers/ConversationView/CV/CVAudioPlayback.swift
index 192f64762c..2b73ea3ad9 100644
--- a/Signal/src/ViewControllers/ConversationView/CV/CVAudioPlayback.swift
+++ b/Signal/src/ViewControllers/ConversationView/CV/CVAudioPlayback.swift
@@ -109,12 +109,10 @@ public class CVAudioPlayer: NSObject {
                                     forAttachmentStream attachmentStream: TSAttachmentStream) {
         AssertIsOnMainThread()
 
-        guard let audioPlayback = ensurePlayback(forAttachmentStream: attachmentStream) else {
-            owsFailDebug("Could not play audio attachment.")
-            return
-        }
         progressCache[attachmentStream.uniqueId] = progress
-        audioPlayback.setProgress(progress)
+        if let audioPlayback = audioPlayback, audioPlayback.attachmentId == attachmentStream.uniqueId {
+            audioPlayback.setProgress(progress)
+        }
     }
 
     @objc