diff --git a/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/CurrenciesScreen.kt b/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/CurrenciesScreen.kt
index 2358743b93..a823149273 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/CurrenciesScreen.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/CurrenciesScreen.kt
@@ -77,7 +77,7 @@ fun CurrenciesScreen(
             visible = tokensState.value.currencies.isEmpty(),
             enter = fadeIn(),
             exit = fadeOut()
-        ){
+        ) {
             Box(
                 contentAlignment = Alignment.Center,
                 modifier = Modifier.fillMaxSize()
@@ -93,8 +93,9 @@ fun CurrenciesScreen(
             exit = fadeOut(animationSpec = tween(1000))
         ) {
             Column {
-                if (tokensState.value.scanResponse?.card?.useOldStyleDerivation == true) CurrenciesWarning()
+                val showHeader = tokensState.value.scanResponse?.card?.useOldStyleDerivation == true
                 ListOfCurrencies(
+                    header = { if (showHeader) CurrenciesWarning() },
                     currencies = tokensState.value.currencies,
                     nonRemovableTokens = tokensState.value.nonRemovableTokens,
                     nonRemovableBlockchains = tokensState.value.nonRemovableBlockchains,
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/ListOfCurrencies.kt b/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/ListOfCurrencies.kt
index 2443f25df4..d55cbd35a4 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/ListOfCurrencies.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/ListOfCurrencies.kt
@@ -17,6 +17,7 @@ import com.tangem.tap.features.tokens.redux.TokenWithBlockchain
 
 @Composable
 fun ListOfCurrencies(
+    header: @Composable ()->Unit,
     currencies: List<Currency>,
     nonRemovableTokens: List<ContractAddress>,
     nonRemovableBlockchains: List<Blockchain>,
@@ -54,6 +55,7 @@ fun ListOfCurrencies(
                     .contains(searchInput)
             }.toList()
         }
+        item { header() }
         items(filteredCurrencies) { currency ->
             CurrencyItem(
                 currency = currency,