diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesCache.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesCache.java
index 961d55c1a..13b117b9a 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesCache.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesCache.java
@@ -455,7 +455,6 @@ public class MessagesCache {
           }
         })
         .onErrorResume(throwable -> {
-          logger.warn("Failed to retrieve shared mrm data", throwable);
 
           final List<Tag> tags = new ArrayList<>();
           tags.add(Tag.of(EPHEMERAL_TAG_NAME, String.valueOf(mrmMessage.getEphemeral())));
@@ -467,6 +466,7 @@ public class MessagesCache {
             // MRM data) fails after it has been delivered. We return it so that it may be discarded from the queue.
             result = Mono.just(mrmMessage.toBuilder().setSharedMrmKey(STALE_MRM_KEY).build());
           } else {
+            logger.warn("Failed to retrieve shared mrm data", throwable);
             // For unexpected errors, return empty. The message will remain in the queue and be retried in the future.
             result = Mono.empty();
           }
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/MrmDataMissingException.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/MrmDataMissingException.java
index 8557fc05a..68da7f867 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/MrmDataMissingException.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/MrmDataMissingException.java
@@ -18,4 +18,9 @@ class MrmDataMissingException extends NoStackTraceRuntimeException {
   Type getType() {
     return type;
   }
+
+  @Override
+  public String toString() {
+    return "MrmDataMissingException{type=%s}".formatted(type);
+  }
 }