diff --git a/app/src/main/java/com/aurora/store/compose/ui/details/ScreenshotScreen.kt b/app/src/main/java/com/aurora/store/compose/ui/details/ScreenshotScreen.kt
index 444b76e94..02821a278 100644
--- a/app/src/main/java/com/aurora/store/compose/ui/details/ScreenshotScreen.kt
+++ b/app/src/main/java/com/aurora/store/compose/ui/details/ScreenshotScreen.kt
@@ -40,6 +40,7 @@ fun ScreenshotScreen(
     windowAdaptiveInfo: WindowAdaptiveInfo = currentWindowAdaptiveInfoV2()
 ) {
     val app by viewModel.app.collectAsStateWithLifecycle()
+    val screenshots = app?.screenshots ?: emptyList()
 
     val topAppBarTitle = when {
         windowAdaptiveInfo.isWindowCompact -> app!!.displayName
@@ -48,7 +49,7 @@ fun ScreenshotScreen(
 
     ScreenContent(
         topAppBarTitle = topAppBarTitle,
-        screenshots = app!!.screenshots,
+        screenshots = screenshots.distinctBy { it.url },
         index = index
     )
 }
@@ -79,7 +80,8 @@ private fun ScreenContent(
             modifier = Modifier
                 .padding(paddingValues)
                 .fillMaxSize(),
-            state = pagerState
+            state = pagerState,
+            key = { screenshots[it].url }
         ) { page ->
             val artwork = screenshots[page]
             ScreenshotListItem(