diff --git a/data/transaction/src/main/java/com/tangem/data/transaction/DefaultGaslessTransactionRepository.kt b/data/transaction/src/main/java/com/tangem/data/transaction/DefaultGaslessTransactionRepository.kt
index e094b97d9d..d01ad65f42 100644
--- a/data/transaction/src/main/java/com/tangem/data/transaction/DefaultGaslessTransactionRepository.kt
+++ b/data/transaction/src/main/java/com/tangem/data/transaction/DefaultGaslessTransactionRepository.kt
@@ -31,7 +31,8 @@ class DefaultGaslessTransactionRepository(
 
     private val supportedTokensState = MutableStateFlow<Map<Network.ID, Set<CryptoCurrency>>>(hashMapOf())
     private val allFeeRecipientAddress = mutableSetOf<String>()
-    private val addressesMutex = Mutex()
+    private val allAddressesMutex = Mutex()
+    private val receiverAddressMutex = Mutex()
     private var feeReceiverAddress: String? = null
 
     private val gaslessTransactionRequestBuilder = GaslessTransactionRequestBuilder()
@@ -78,7 +79,7 @@ class DefaultGaslessTransactionRepository(
 
     override suspend fun getTokenFeeReceiverAddress(): String {
         return withContext(coroutineDispatcherProvider.io) {
-            addressesMutex.withLock {
+            receiverAddressMutex.withLock {
                 val feeReceiver = feeReceiverAddress
                 if (feeReceiver != null) {
                     return@withContext feeReceiver
@@ -133,7 +134,7 @@ class DefaultGaslessTransactionRepository(
         if (!sendFeatureToggles.isGaslessTransactionsEnabled) {
             return EMPTY_ADDRESSES
         }
-        return addressesMutex.withLock {
+        return allAddressesMutex.withLock {
             allFeeRecipientAddress.ifEmpty {
                 val allFeeAddresses = getAllFeeRecipientAddresses()
                 allFeeRecipientAddress.addAll(allFeeAddresses)
diff --git a/domain/legacy/src/main/assets/contract_methods.json b/domain/legacy/src/main/assets/contract_methods.json
index 5f421e8506..626e7657e1 100644
--- a/domain/legacy/src/main/assets/contract_methods.json
+++ b/domain/legacy/src/main/assets/contract_methods.json
@@ -247,7 +247,7 @@
         "source": "https://docs.p2p.org/",
         "name": "pooledUnstake"
     },
-    "0xaa03b617": {
+    "0x6234d42b": {
         "info": "GaslessTransactions",
         "source": "https://github.com/tangem-developments/tangem-gasless-service",
         "name": "gaslessTransaction"