diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailActivity.kt
index 46eeb4ecc0..95c1a874a6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailActivity.kt
@@ -130,7 +130,7 @@ class MessageDetailActivity : PassphraseRequiredActionBarActivity() {
                 threadDb = threadDb,
                 messageDetails = details,
                 onReply = { setResultAndFinish(ON_REPLY) },
-                onResend = { setResultAndFinish(ON_RESEND) },
+                onResend = details.error?.let { { setResultAndFinish(ON_RESEND) } },
                 onDelete = { setResultAndFinish(ON_DELETE) },
                 onClickImage = { slide ->
                     // only open to downloaded images