diff --git a/ts/jobs/AttachmentDownloadManager.ts b/ts/jobs/AttachmentDownloadManager.ts
index 23adb9168a..78d33305ea 100644
--- a/ts/jobs/AttachmentDownloadManager.ts
+++ b/ts/jobs/AttachmentDownloadManager.ts
@@ -180,18 +180,11 @@ export class AttachmentDownloadManager extends JobManager<CoreAttachmentDownload
 
     const newJob = parseResult.data;
 
-    const { isAlreadyRunning } = await this._addJob(newJob, {
+    await this._addJob(newJob, {
       forceStart: urgency === AttachmentDownloadUrgency.IMMEDIATE,
     });
 
-    if (isAlreadyRunning) {
-      return attachment;
-    }
-
-    return {
-      ...attachment,
-      pending: !this.params.shouldHoldOffOnStartingQueuedJobs?.(),
-    };
+    return attachment;
   }
 
   updateVisibleTimelineMessages(messageIds: Array<string>): void {
diff --git a/ts/models/messages.ts b/ts/models/messages.ts
index e6471d53c2..1ef4ba2596 100644
--- a/ts/models/messages.ts
+++ b/ts/models/messages.ts
@@ -1348,6 +1348,8 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
     }
 
     this.set(value);
+    queueUpdateMessage(this.attributes);
+
     return true;
   }