diff --git a/app/src/main/java/net/jeena/jtubetv/ui/screens/ChannelsScreen.kt b/app/src/main/java/net/jeena/jtubetv/ui/screens/ChannelsScreen.kt
index 00ca382..fa76b3a 100644
--- a/app/src/main/java/net/jeena/jtubetv/ui/screens/ChannelsScreen.kt
+++ b/app/src/main/java/net/jeena/jtubetv/ui/screens/ChannelsScreen.kt
@@ -237,7 +237,7 @@ private fun ChannelCardRow(
     onLeftAtStart: () -> Unit,
 ) {
     val rowState = androidx.compose.foundation.lazy.rememberLazyListState()
-    val focusRequesters = remember { mutableMapOf<Int, FocusRequester>() }
+    val focusRequesters = remember { HashMap<Int, FocusRequester>() }
     var focusedIndex by remember { mutableIntStateOf(-1) }
     var clickedIndex by remember { mutableIntStateOf(-1) }
 
diff --git a/app/src/main/java/net/jeena/jtubetv/ui/screens/HomeRows.kt b/app/src/main/java/net/jeena/jtubetv/ui/screens/HomeRows.kt
index 625a6d0..69dafd1 100644
--- a/app/src/main/java/net/jeena/jtubetv/ui/screens/HomeRows.kt
+++ b/app/src/main/java/net/jeena/jtubetv/ui/screens/HomeRows.kt
@@ -260,7 +260,7 @@ fun FocusScrollRow(
     afterItem: @Composable (index: Int, video: VideoDto) -> Unit = { _, _ -> },
 ) {
     val rowState = rememberLazyListState()
-    val focusRequesters = remember { androidx.compose.runtime.mutableStateMapOf<Int, FocusRequester>() }
+    val focusRequesters = remember { HashMap<Int, FocusRequester>() }
     var focusedIndex by remember { androidx.compose.runtime.mutableStateOf(-1) }
     // BACK from playback: scroll to + focus the card that was opened (user request).
     LaunchedEffect(restoreToken) {