diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushProcessMessageJobV2.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushProcessMessageJobV2.kt
index 7902e7e565..cc410f20f4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushProcessMessageJobV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushProcessMessageJobV2.kt
@@ -145,7 +145,11 @@ class PushProcessMessageJobV2 private constructor(
         }
         PushProcessMessageJobV2(builder.build(), result.envelope.toBuilder().clearContent().build(), result.content, result.metadata, result.serverDeliveredTimestamp)
       } else {
-        messageProcessor.process(result.envelope, result.content, result.metadata, result.serverDeliveredTimestamp)
+        try {
+          messageProcessor.process(result.envelope, result.content, result.metadata, result.serverDeliveredTimestamp)
+        } catch (e: Exception) {
+          Log.e(TAG, "Failed to process message with timestamp ${result.envelope.timestamp}. Dropping.")
+        }
         null
       }
     }