diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/music/LyricsContent.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/music/LyricsContent.kt
index 9a070d40..22e9b048 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/music/LyricsContent.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/music/LyricsContent.kt
@@ -39,7 +39,6 @@ import org.jellyfin.sdk.model.api.LyricLine
 @Composable
 fun LyricsContent(
     lyricsHaveFocus: Boolean,
-    synced: Boolean,
     lyrics: LyricDto?,
     currentLyricPosition: Int?,
     onClick: (LyricLine) -> Unit,
@@ -50,11 +49,11 @@ fun LyricsContent(
         remember(lyrics) { List(lyrics?.lyrics.orEmpty().size) { FocusRequester() } }
     val listState = rememberLazyListState(currentLyricPosition ?: 0)
     val bringIntoViewRequester = remember { BringIntoViewRequester() }
-    if (synced) {
+    if (!lyricsHaveFocus) {
         LaunchedEffect(currentLyricPosition) {
-            if (currentLyricPosition != null && !lyricsHaveFocus) {
+            if (currentLyricPosition != null) {
                 listState.layoutInfo.visibleItemsInfo.lastOrNull()?.index?.let {
-                    if (currentLyricPosition !in 0..it) {
+                    if (currentLyricPosition !in listState.firstVisibleItemIndex..it) {
                         listState.animateScrollToItem(currentLyricPosition)
                     }
                 }
diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/music/NowPlayingPage.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/music/NowPlayingPage.kt
index 4f95d4bc..a6235688 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/music/NowPlayingPage.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/music/NowPlayingPage.kt
@@ -220,7 +220,6 @@ fun NowPlayingPage(
                         .fillMaxHeight(),
             ) {
                 LyricsContent(
-                    synced = true,
                     lyrics = state.lyrics,
                     currentLyricPosition = state.currentLyricIndex,
                     lyricsHaveFocus = lyricsHaveFocus,