diff --git a/src/commonMain/kotlin/fr/acinq/lightning/crypto/KeyManager.kt b/src/commonMain/kotlin/fr/acinq/lightning/crypto/KeyManager.kt
index c2a102620..4288eac4e 100644
--- a/src/commonMain/kotlin/fr/acinq/lightning/crypto/KeyManager.kt
+++ b/src/commonMain/kotlin/fr/acinq/lightning/crypto/KeyManager.kt
@@ -138,6 +138,7 @@ interface KeyManager {
         val legacySwapInProtocol = SwapInProtocolLegacy(userPublicKey, remoteServerPublicKey, refundDelay)
 
         val swapInProtocol = SwapInProtocol(userPublicKey, remoteServerPublicKey, userRefundPublicKey, refundDelay)
+        val descriptor = SwapInProtocol.descriptor(chain, userPublicKey, remoteServerPublicKey, refundDelay, userRefundExtendedPrivateKey)
 
         /**
          * The output script descriptor matching our legacy swap-in addresses.
diff --git a/src/commonMain/kotlin/fr/acinq/lightning/transactions/SwapInProtocol.kt b/src/commonMain/kotlin/fr/acinq/lightning/transactions/SwapInProtocol.kt
index 9141766b5..6a7d77964 100644
--- a/src/commonMain/kotlin/fr/acinq/lightning/transactions/SwapInProtocol.kt
+++ b/src/commonMain/kotlin/fr/acinq/lightning/transactions/SwapInProtocol.kt
@@ -89,8 +89,7 @@ class SwapInProtocol(val userPublicKey: PublicKey, val serverPublicKey: PublicKe
                 else -> DeterministicWallet.tprv
             }
             val xpriv = DeterministicWallet.encode(masterRefundKey, prefix)
-            val path = masterRefundKey.path.toString().replace('\'', 'h').removePrefix("m")
-            val desc = "tr(${internalPubKey.value},and_v(v:pk($xpriv$path/*),older($refundDelay)))"
+            val desc = "tr(${internalPubKey.value},and_v(v:pk($xpriv/*),older($refundDelay)))"
             val checksum = Descriptor.checksum(desc)
             return "$desc#$checksum"
         }