diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/channels/ECDHRendezvousChannel.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/channels/ECDHRendezvousChannel.kt
index 33837bc425..cced29aab4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/channels/ECDHRendezvousChannel.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/channels/ECDHRendezvousChannel.kt
@@ -94,7 +94,7 @@ class ECDHRendezvousChannel(override var transport: RendezvousTransport, theirPu
         val isInitiator = theirPublicKey == null
 
         if (isInitiator) {
-            Timber.tag(TAG).i("Waiting for other device to send their public key")
+//            Timber.tag(TAG).i("Waiting for other device to send their public key")
             val res = this.receiveAsPayload() ?: throw RuntimeException("No reply from other device")
 
             if (res.key == null) {
@@ -106,7 +106,7 @@ class ECDHRendezvousChannel(override var transport: RendezvousTransport, theirPu
             theirPublicKey = Base64.decode(res.key, Base64.NO_WRAP)
         } else {
             // send our public key unencrypted
-            Timber.tag(TAG).i("Sending public key")
+//            Timber.tag(TAG).i("Sending public key")
             send(ECDHPayload(
                     algorithm = SecureRendezvousChannelAlgorithm.ECDH_V1,
                     key = Base64.encodeToString(ourPublicKey, Base64.NO_WRAP)
@@ -121,10 +121,10 @@ class ECDHRendezvousChannel(override var transport: RendezvousTransport, theirPu
 
         aesKey = olmSAS!!.generateShortCode(aesInfo, 32)
 
-        Timber.tag(TAG).i("Our public key: ${Base64.encodeToString(ourPublicKey, Base64.NO_WRAP)}")
-        Timber.tag(TAG).i("Their public key: ${Base64.encodeToString(theirPublicKey, Base64.NO_WRAP)}")
-        Timber.tag(TAG).i("AES info: $aesInfo")
-        Timber.tag(TAG).i("AES key: ${Base64.encodeToString(aesKey, Base64.NO_WRAP)}")
+//        Timber.tag(TAG).i("Our public key: ${Base64.encodeToString(ourPublicKey, Base64.NO_WRAP)}")
+//        Timber.tag(TAG).i("Their public key: ${Base64.encodeToString(theirPublicKey, Base64.NO_WRAP)}")
+//        Timber.tag(TAG).i("AES info: $aesInfo")
+//        Timber.tag(TAG).i("AES key: ${Base64.encodeToString(aesKey, Base64.NO_WRAP)}")
 
         val rawChecksum = olmSAS!!.generateShortCode(aesInfo, 5)
         return getDecimalCodeRepresentation(rawChecksum)
@@ -180,7 +180,7 @@ class ECDHRendezvousChannel(override var transport: RendezvousTransport, theirPu
     }
 
     private fun encrypt(plainText: ByteArray): ECDHPayload {
-        Timber.tag(TAG).i("Encrypting: ${plainText.toString(Charsets.UTF_8)}")
+//        Timber.tag(TAG).d("Encrypting: ${plainText.toString(Charsets.UTF_8)}")
         val iv = ByteArray(16)
         SecureRandom().nextBytes(iv)
 
@@ -212,7 +212,7 @@ class ECDHRendezvousChannel(override var transport: RendezvousTransport, theirPu
 
         val plainTextBytes = plainText.toByteArray()
 
-        Timber.tag(TAG).i("Decrypted: ${plainTextBytes.toString(Charsets.UTF_8)}")
+//        Timber.tag(TAG).d("Decrypted: ${plainTextBytes.toString(Charsets.UTF_8)}")
         return plainTextBytes
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/transports/SimpleHttpRendezvousTransport.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/transports/SimpleHttpRendezvousTransport.kt
index 3e5e1121ea..cc4346d55e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/transports/SimpleHttpRendezvousTransport.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/transports/SimpleHttpRendezvousTransport.kt
@@ -67,7 +67,7 @@ class SimpleHttpRendezvousTransport(override var onCancelled: ((reason: Rendezvo
         // TODO: properly determine endpoint
         val uri = if (uri != null) uri!! else "https://rendezvous.lab.element.dev"
 
-        Timber.tag(TAG).i("Sending data: ${data.toString(Charsets.UTF_8)} to $uri")
+//        Timber.tag(TAG).i("Sending data: ${data.toString(Charsets.UTF_8)} to $uri")
 
         val httpClient = okhttp3.OkHttpClient.Builder().build()
 
@@ -123,8 +123,7 @@ class SimpleHttpRendezvousTransport(override var onCancelled: ((reason: Rendezvo
             val response = httpClient.newCall(request.build()).execute()
 
             try {
-
-                Timber.tag(TAG).i("Received polling response: ${response.code} from $uri")
+//                Timber.tag(TAG).d("Received polling response: ${response.code} from $uri")
 
                 if (response.code == 404) {
                     cancel(RendezvousFailureReason.Unknown)
@@ -142,7 +141,7 @@ class SimpleHttpRendezvousTransport(override var onCancelled: ((reason: Rendezvo
                         etag = it
                     }
                     val data = response.body?.bytes()
-                    Timber.tag(TAG).i("Received data: ${data?.toString(Charsets.UTF_8)} from $uri with etag $etag")
+//                    Timber.tag(TAG).d("Received data: ${data?.toString(Charsets.UTF_8)} from $uri with etag $etag")
                     return data
                 }
 
@@ -158,6 +157,7 @@ class SimpleHttpRendezvousTransport(override var onCancelled: ((reason: Rendezvo
 
     override suspend fun cancel(reason: RendezvousFailureReason) {
         var mappedReason = reason
+        Timber.tag(TAG).i("$expiresAt")
         if (mappedReason == RendezvousFailureReason.Unknown &&
                 expiresAt != null && Date() > expiresAt) {
             mappedReason = RendezvousFailureReason.Expired