diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/CashuProcessor.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/CashuProcessor.kt
index 3c77ce97c..d3f25c7fd 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/service/CashuProcessor.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/service/CashuProcessor.kt
@@ -80,16 +80,17 @@ class CashuProcessor {
                 .post(requestBody)
                 .build()
 
-            val response = client.newCall(request).execute()
-            val body = response.body.string()
-            val tree = jacksonObjectMapper().readTree(body)
+            client.newCall(request).execute().use {
+                val body = it.body.string()
+                val tree = jacksonObjectMapper().readTree(body)
 
-            val successful = tree?.get("paid")?.asText() == "true"
+                val successful = tree?.get("paid")?.asText() == "true"
 
-            if (successful) {
-                onSuccess("Redeemed ${token.totalAmount} Sats" + " (Fees: ${token.fees} Sats)")
-            } else {
-                onError(tree?.get("detail")?.asText()?.split('.')?.getOrNull(0) ?: "Cashu: Tokens already spent.")
+                if (successful) {
+                    onSuccess("Redeemed ${token.totalAmount} Sats" + " (Fees: ${token.fees} Sats)")
+                } else {
+                    onError(tree?.get("detail")?.asText()?.split('.')?.getOrNull(0) ?: "Cashu: Tokens already spent.")
+                }
             }
         } catch (e: Exception) {
             onError("Token melt failure: " + e.message)
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/notifications/RegisterAccounts.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/notifications/RegisterAccounts.kt
index f3772e3e4..7407651d3 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/service/notifications/RegisterAccounts.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/service/notifications/RegisterAccounts.kt
@@ -56,7 +56,9 @@ class RegisterAccounts(
 
             val client = HttpClient.getHttpClient()
 
-            client.newCall(request).execute()
+            val isSucess = client.newCall(request).execute().use {
+                it.isSuccessful
+            }
         } catch (e: java.lang.Exception) {
             Log.e("FirebaseMsgService", "Unable to register with push server", e)
         }
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/previews/UrlPreviewUtils.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/previews/UrlPreviewUtils.kt
index 769cb1e94..2aa55d4f9 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/service/previews/UrlPreviewUtils.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/service/previews/UrlPreviewUtils.kt
@@ -63,7 +63,9 @@ private const val CONTENT = "content"
 suspend fun getDocument(url: String, timeOut: Int = 30000): Document =
     withContext(Dispatchers.IO) {
         val request: Request = Request.Builder().url(url).get().build()
-        val html = HttpClient.getHttpClient().newCall(request).execute().body.string()
+        val html = HttpClient.getHttpClient().newCall(request).execute().use {
+            it.body.string()
+        }
 
         Jsoup.parse(html)
     }
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/ImageUploader.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/ImageUploader.kt
index 2ed87ee16..a949d5490 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/ImageUploader.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/ImageUploader.kt
@@ -234,14 +234,14 @@ class NostrCheckMeServer : FileServer() {
             .build()
 
         while (!isCompleted) {
-            val response = client.newCall(request).execute()
-            val body = response.body?.string()
-            val tree = jacksonObjectMapper().readTree(body)
-            isCompleted = tree?.get("status")?.asText() == "completed"
-            try {
-                Thread.sleep(500)
-            } catch (e: InterruptedException) {
-                e.printStackTrace()
+            client.newCall(request).execute().use {
+                val tree = jacksonObjectMapper().readTree(it.body.string())
+                isCompleted = tree?.get("status")?.asText() == "completed"
+                try {
+                    Thread.sleep(500)
+                } catch (e: InterruptedException) {
+                    e.printStackTrace()
+                }
             }
         }
         return url