diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a4f412e143..572c502794 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -149,6 +149,8 @@
     <string name="enter_wallet_address">enter wallet address</string>
     <string name="enter_amount">enter amount</string>
     <string name="verify">Verify</string>
+    <string name="wallet_address_empty">Wallet address is empty</string>
+    <string name="amount_empty">Amount is empty</string>
 
     <!-- PinRequestActivity -->
     <string name="enter_new_pin_or_use_fingerprint_scanner">Enter new PIN or use fingerprint scanner</string>
diff --git a/app/src/tangemCardano/java/com/tangem/ui/PrepareTransactionActivity.kt b/app/src/tangemCardano/java/com/tangem/ui/PrepareTransactionActivity.kt
index 2e53914061..e21afd6223 100644
--- a/app/src/tangemCardano/java/com/tangem/ui/PrepareTransactionActivity.kt
+++ b/app/src/tangemCardano/java/com/tangem/ui/PrepareTransactionActivity.kt
@@ -8,6 +8,7 @@ import android.nfc.Tag
 import android.os.Build
 import android.os.Bundle
 import android.text.Html
+import android.text.TextUtils
 import android.view.MotionEvent
 import android.view.View
 import android.view.View.OnTouchListener
@@ -43,7 +44,7 @@ class PrepareTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallbac
     @Inject
     internal lateinit var navigator: Navigator
 
-//    private lateinit var ctx: TangemContext
+    //    private lateinit var ctx: TangemContext
     private lateinit var nfcManager: NfcManager
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -101,10 +102,22 @@ class PrepareTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallbac
                 return@setOnClickListener
             }
 
-            val engine1 = CoinEngineFactory.createCardano(TangemContext())
-            val strAmount: String = etAmount.text.toString().replace(",", ".")
-            val amount = engine1!!.convertToAmount(etAmount.text.toString(), tvCurrency.text.toString())
+            // check on empty wallet address
+            if (etWallet.text.toString() == "") {
+                etWallet.error = getString(R.string.wallet_address_empty)
+                return@setOnClickListener
+            }
 
+            // check on empty amount
+            if (etAmount.text.toString() == "") {
+                etAmount.error = getString(R.string.amount_empty)
+                return@setOnClickListener
+            }
+
+            val strAmount: String = etAmount.text.toString().replace(",", ".")
+            val amount = engine.convertToAmount(etAmount.text.toString(), tvCurrency.text.toString())
+
+            // check amount
             try {
                 if (!engine.checkNewTransactionAmount(amount))
                     etAmount.error = getString(R.string.not_enough_funds_on_your_card)
@@ -115,7 +128,7 @@ class PrepareTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallbac
             }
 
             // check wallet address
-            if (!engine1.validateAddress(etWallet.text.toString())) {
+            if (!engine.validateAddress(etWallet.text.toString())) {
                 etWallet.error = getString(R.string.incorrect_destination_wallet_address)
                 return@setOnClickListener
             } else