diff --git a/data/swap/src/main/java/com/tangem/data/swap/DefaultSwapRepositoryV2.kt b/data/swap/src/main/java/com/tangem/data/swap/DefaultSwapRepositoryV2.kt
index 20d6cbf213..b229533df3 100644
--- a/data/swap/src/main/java/com/tangem/data/swap/DefaultSwapRepositoryV2.kt
+++ b/data/swap/src/main/java/com/tangem/data/swap/DefaultSwapRepositoryV2.kt
@@ -248,7 +248,7 @@ internal class DefaultSwapRepositoryV2 @Inject constructor(
                 userWallet = userWallet,
                 appPreferencesStore = appPreferencesStore,
             ),
-            toExtraId = toExtraId,
+            toExtraId = toExtraId?.ifEmpty { null },
         ).getOrThrow()
 
         if (dataSignatureVerifier.verifySignature(response.signature, response.txDetailsJson)) {
diff --git a/features/swap/data/src/main/java/com/tangem/feature/swap/DefaultSwapRepository.kt b/features/swap/data/src/main/java/com/tangem/feature/swap/DefaultSwapRepository.kt
index d207e7992b..ef5dc2f371 100644
--- a/features/swap/data/src/main/java/com/tangem/feature/swap/DefaultSwapRepository.kt
+++ b/features/swap/data/src/main/java/com/tangem/feature/swap/DefaultSwapRepository.kt
@@ -312,7 +312,7 @@ internal class DefaultSwapRepository(
                         userWallet = userWallet,
                         appPreferencesStore = appPreferencesStore,
                     ),
-                    toExtraId = toExtraId,
+                    toExtraId = toExtraId?.ifEmpty { null },
                 ).getOrThrow()
                 if (dataSignatureVerifier.verifySignature(response.signature, response.txDetailsJson)) {
                     val txDetails = parseTxDetails(response.txDetailsJson)