diff --git a/src/Messages/OWSMessageSender.m b/src/Messages/OWSMessageSender.m
index f884dcce4..b9553fdc5 100644
--- a/src/Messages/OWSMessageSender.m
+++ b/src/Messages/OWSMessageSender.m
@@ -148,6 +148,8 @@ NSUInteger const OWSSendMessageOperationMaxRetries = 4;
             return;
         }
 
+        [strongSelf.messageSender saveMessage:strongSelf.message withError:error];
+
         DDLogDebug(@"%@ failed with error: %@", strongSelf.tag, error);
         aFailureHandler(error);
         [strongSelf markAsComplete];
@@ -237,8 +239,6 @@ NSUInteger const OWSSendMessageOperationMaxRetries = 4;
         } else {
             DDLogWarn(@"%@ Too many failures. Giving up sending.", self.tag);
 
-            [self.messageSender saveMessage:self.message withError:error];
-
             self.failureHandler(error);
         }
     };