diff --git a/app/src/main/play/release-notes/en-GB/production.txt b/app/src/main/play/release-notes/en-GB/production.txt
index d6428b8c..6c40f25b 100644
--- a/app/src/main/play/release-notes/en-GB/production.txt
+++ b/app/src/main/play/release-notes/en-GB/production.txt
@@ -1,3 +1,8 @@
+v2.1.8
+- Fix scroll position restoration on all screens
+- Smoother media detail header scroll transition
+- Fix crash when clicking non-navigatable queue source
+
 v2.1.7
 - Animated lists in playback sheet queue and playlist editor
 
diff --git a/buildSrc/src/main/java/tm/alashow/buildSrc/App.kt b/buildSrc/src/main/java/tm/alashow/buildSrc/App.kt
index 79fd743d..4be095f0 100644
--- a/buildSrc/src/main/java/tm/alashow/buildSrc/App.kt
+++ b/buildSrc/src/main/java/tm/alashow/buildSrc/App.kt
@@ -6,6 +6,6 @@ object App {
     const val compileSdkVersion = 31
     const val targetSdkVersion = 31
     const val minSdkVersion = 21
-    const val versionCode = 233
-    const val versionName = "2.1.73"
+    const val versionCode = 234
+    const val versionName = "2.1.8"
 }
diff --git a/modules/core-ui-media/src/main/java/tm/alashow/datmusic/ui/detail/MediaDetailHeader.kt b/modules/core-ui-media/src/main/java/tm/alashow/datmusic/ui/detail/MediaDetailHeader.kt
index 2c909981..6e5e2fe6 100644
--- a/modules/core-ui-media/src/main/java/tm/alashow/datmusic/ui/detail/MediaDetailHeader.kt
+++ b/modules/core-ui-media/src/main/java/tm/alashow/datmusic/ui/detail/MediaDetailHeader.kt
@@ -37,7 +37,6 @@ fun coverHeaderScrollProgress(listState: LazyListState, height: Dp = CoverHeader
     val headerProgress = remember { mutableStateOf(0f) }
     LaunchedEffect(listState) {
         snapshotFlow { listState.firstVisibleItemScrollOffset }
-            .map { listState.firstVisibleItemScrollOffset }
             .map { (it / density).dp / height }
             .map { if (listState.firstVisibleItemIndex == 0) it else 1f }
             .map { it.coerceIn(0f, 1f) }