diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VoiceMessageView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VoiceMessageView.kt
index b5fea727c7..b957b0a166 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VoiceMessageView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VoiceMessageView.kt
@@ -45,7 +45,9 @@ class VoiceMessageView : LinearLayout, AudioSlidePlayer.Listener {
         val player = AudioSlidePlayer.createFor(context, audio, this)
         this.player = player
         isPreparing = true
-        player.play(0.0)
+        if (!audio.isPendingDownload && !audio.isInProgress) {
+            player.play(0.0)
+        }
         voiceMessageViewLoader.isVisible = audio.isPendingDownload
         val cornerRadii = MessageBubbleUtilities.calculateRadii(context, isStartOfMessageCluster, isEndOfMessageCluster, message.isOutgoing)
         cornerMask.setTopLeftRadius(cornerRadii[0])
diff --git a/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt b/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt
index e4cc76974f..11d9298428 100644
--- a/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt
@@ -33,7 +33,7 @@ class AttachmentUploadJob(val attachmentID: Long, val threadID: String, val mess
     }
 
     // Settings
-    override val maxFailureCount: Int = 20
+    override val maxFailureCount: Int = 2
 
     companion object {
         val TAG = AttachmentUploadJob::class.simpleName
diff --git a/libsession/src/main/java/org/session/libsession/messaging/jobs/MessageSendJob.kt b/libsession/src/main/java/org/session/libsession/messaging/jobs/MessageSendJob.kt
index 274f11c3e3..7d25debe40 100644
--- a/libsession/src/main/java/org/session/libsession/messaging/jobs/MessageSendJob.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/jobs/MessageSendJob.kt
@@ -22,7 +22,7 @@ class MessageSendJob(val message: Message, val destination: Destination) : Job {
     override var id: String? = null
     override var failureCount: Int = 0
 
-    override val maxFailureCount: Int = 10
+    override val maxFailureCount: Int = 2
 
     companion object {
         val TAG = MessageSendJob::class.simpleName