diff --git a/app/src/main/java/com/tangem/domain/wallet/CoinEngine.java b/app/src/main/java/com/tangem/domain/wallet/CoinEngine.java
index f97c7c217e..99fb710d2a 100644
--- a/app/src/main/java/com/tangem/domain/wallet/CoinEngine.java
+++ b/app/src/main/java/com/tangem/domain/wallet/CoinEngine.java
@@ -236,12 +236,7 @@ public abstract class CoinEngine {
 
     public void defineWallet() throws CardProtocol.TangemException {
         try {
-            String wallet;
-            if (ctx.getBlockchain() == Blockchain.BitcoinCash) {
-                wallet = calculateAddress(ctx.getCard().getWalletPublicKeyRar());
-            } else {
-                wallet = calculateAddress(ctx.getCard().getWalletPublicKey());
-            }    
+            String wallet = calculateAddress(ctx.getCard().getWalletPublicKey());
             ctx.getCoinData().setWallet(wallet);
         }
         catch (Exception e)
diff --git a/app/src/main/java/com/tangem/domain/wallet/bch/BtcCashEngine.java b/app/src/main/java/com/tangem/domain/wallet/bch/BtcCashEngine.java
index c050ba8d8a..8fd87ee969 100644
--- a/app/src/main/java/com/tangem/domain/wallet/bch/BtcCashEngine.java
+++ b/app/src/main/java/com/tangem/domain/wallet/bch/BtcCashEngine.java
@@ -424,6 +424,20 @@ public class BtcCashEngine extends CoinEngine {
         return coinData.getUnspentInputsDescription();
     }
 
+    @Override
+    public void defineWallet() throws CardProtocol.TangemException {
+        try {
+            String wallet = calculateAddress(ctx.getCard().getWalletPublicKeyRar());
+            ctx.getCoinData().setWallet(wallet);
+        }
+        catch (Exception e)
+        {
+            ctx.getCoinData().setWallet("ERROR");
+            throw new CardProtocol.TangemException("Can't define wallet address");
+        }
+
+    }
+
 //    @Override
 //    public String getAmountDescription(TangemCard mCard, String amount) throws Exception {
 //        return mCard.getAmountDescription(Double.parseDouble(amount));