diff --git a/libsession/src/main/java/org/session/libsession/snode/OnionRequestAPI.kt b/libsession/src/main/java/org/session/libsession/snode/OnionRequestAPI.kt
index 087c8e29d3..f3b2c5f93f 100644
--- a/libsession/src/main/java/org/session/libsession/snode/OnionRequestAPI.kt
+++ b/libsession/src/main/java/org/session/libsession/snode/OnionRequestAPI.kt
@@ -446,8 +446,8 @@ object OnionRequestAPI {
         val payloadData = JsonUtil.toJson(payload).toByteArray()
         return sendOnionRequest(Destination.Snode(snode), payloadData, version).recover { exception ->
             val error = when (exception) {
-                is HTTP.HTTPRequestFailedException -> SnodeAPI.handleSnodeError(exception.statusCode, exception.json, snode, publicKey)
                 is HTTPRequestFailedAtDestinationException -> SnodeAPI.handleSnodeError(exception.statusCode, exception.json, snode, publicKey)
+                is HTTP.HTTPRequestFailedException -> SnodeAPI.handleSnodeError(exception.statusCode, exception.json, snode, publicKey)
                 else -> null
             }
             if (error != null) { throw error }
diff --git a/libsession/src/main/java/org/session/libsession/utilities/DownloadUtilities.kt b/libsession/src/main/java/org/session/libsession/utilities/DownloadUtilities.kt
index b850baa253..27b6b244ba 100644
--- a/libsession/src/main/java/org/session/libsession/utilities/DownloadUtilities.kt
+++ b/libsession/src/main/java/org/session/libsession/utilities/DownloadUtilities.kt
@@ -4,7 +4,9 @@ import okhttp3.HttpUrl
 import org.session.libsession.messaging.file_server.FileServerApi
 import org.session.libsignal.utilities.HTTP
 import org.session.libsignal.utilities.Log
-import java.io.*
+import java.io.File
+import java.io.FileOutputStream
+import java.io.OutputStream
 
 object DownloadUtilities {
 
@@ -14,7 +16,7 @@ object DownloadUtilities {
     @JvmStatic
     fun downloadFile(destination: File, url: String) {
         val outputStream = FileOutputStream(destination) // Throws
-        var remainingAttempts = 4
+        var remainingAttempts = 2
         var exception: Exception? = null
         while (remainingAttempts > 0) {
             remainingAttempts -= 1