diff --git a/appholder/src/main/java/com/android/identity/wallet/transfer/TransferManager.kt b/appholder/src/main/java/com/android/identity/wallet/transfer/TransferManager.kt
index c130112a6..5d6748392 100644
--- a/appholder/src/main/java/com/android/identity/wallet/transfer/TransferManager.kt
+++ b/appholder/src/main/java/com/android/identity/wallet/transfer/TransferManager.kt
@@ -264,7 +264,9 @@ class TransferManager private constructor(private val context: Context) {
 
     fun sendResponse(deviceResponse: ByteArray, closeAfterSending: Boolean) {
         communication.sendResponse(deviceResponse, closeAfterSending)
-        disconnect(!closeAfterSending)
+        if (closeAfterSending) {
+            disconnect(false)
+        }
     }
 
     fun readDocumentEntries(documentName: String): DocumentElements {