diff --git a/app/src/main/java/com/tangem/tap/common/extensions/Specific.kt b/app/src/main/java/com/tangem/tap/common/extensions/Specific.kt
index b431b780ad..219e9339da 100644
--- a/app/src/main/java/com/tangem/tap/common/extensions/Specific.kt
+++ b/app/src/main/java/com/tangem/tap/common/extensions/Specific.kt
@@ -53,8 +53,7 @@ fun BigDecimal.toFiatString(
     fiatCurrencyName: String,
     formatWithSpaces: Boolean = false
 ): String {
-    var fiatValue = rateValue.multiply(this)
-    fiatValue = fiatValue.setScale(2, RoundingMode.HALF_UP)
+    val fiatValue = rateValue.multiply(this)
     return fiatValue.toFormattedFiatValue(fiatCurrencyName, formatWithSpaces)
 }
 
@@ -67,7 +66,8 @@ fun BigDecimal.toFormattedFiatValue(
     fiatCurrencyName: String,
     formatWithSpaces: Boolean = false
 ): String {
-    val fiatValue = if (formatWithSpaces) this.formatWithSpaces() else this
+    val fiatValue = this.setScale(2, RoundingMode.HALF_UP)
+        .let { if (formatWithSpaces) it.formatWithSpaces() else it }
     return " ${fiatValue}  $fiatCurrencyName"
 }
 
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/WalletReducer.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/WalletReducer.kt
index fe7213d361..04fec99524 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/WalletReducer.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/WalletReducer.kt
@@ -217,8 +217,8 @@ private fun internalReduce(action: Action, state: AppState): WalletState {
                             currency = walletBlockchain.currency,
                         ),
                         fiatAmount = fiatAmount,
-                        fiatAmountFormatted = fiatAmount.toFiatRateString(
-                            fiatCurrencyName = store.state.globalState.appCurrency.symbol
+                        fiatAmountFormatted = fiatAmount.toFormattedFiatValue(
+                            fiatCurrencyName = state.globalState.appCurrency.symbol
                         ),
                         amountToCreateAccount = action.amountToCreateAccount,
                     )
@@ -439,7 +439,7 @@ private fun setMultiWalletFiatRate(
                 wallet?.getTokenAmount(currency.token)?.value?.toFiatValue(rate)
         }
         if (currencyData.status == BalanceStatus.NoAccount && fiatAmount == null) {
-            fiatAmount = BigDecimal.ZERO
+            fiatAmount = BigDecimal.ZERO.setScale(2)
         }
         val fiatAmountFormatted = fiatAmount?.toFormattedFiatValue(appCurrency.symbol)