diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/WalletScreen.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/WalletScreen.kt
index 8dc7d7fd8f..c1d3d9cd26 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/WalletScreen.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/WalletScreen.kt
@@ -179,7 +179,11 @@ private fun WalletContent(
             contentPadding = contentPadding,
             horizontalAlignment = Alignment.CenterHorizontally,
         ) {
-            item(key = "WalletsList" + state.selectedWalletIndex, contentType = "WalletsList") {
+            item(
+                // !!! Type of the key should be saveable via Bundle on Android !!!
+                key = state.wallets.map { it.walletCardState.id.stringValue },
+                contentType = state.wallets.map { it.walletCardState.id },
+            ) {
                 WalletsList(
                     lazyListState = walletsListState,
                     wallets = state.wallets.map(WalletState::walletCardState).toImmutableList(),