diff --git a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m
index 5fc7029483..bbc91e8fad 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m
+++ b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m
@@ -16,6 +16,7 @@
 #import "TSQuotedMessage.h"
 #import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalCoreKit/NSString+OWS.h>
+#import <SignalServiceKit/AppReadiness.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 #import <YapDatabase/YapDatabase.h>
 #import <YapDatabase/YapDatabaseTransaction.h>
@@ -512,6 +513,11 @@ NSUInteger const TSOutgoingMessageSchemaVersion = 1;
         // Message is not transient; no need to clean up attachments.
         return;
     }
+    if (!AppReadiness.isAppReady) {
+        // We don't want or need to do this clean up while registering extensions,
+        // migrating, etc.
+        return;
+    }
     NSArray<NSString *> *_Nullable attachmentIds = self.attachmentIds;
     if (attachmentIds.count < 1) {
         return;