diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/widget/recent/RecentListFactory.kt b/app/src/main/kotlin/org/koitharu/kotatsu/widget/recent/RecentListFactory.kt
index 18c62cb85..3a317dd07 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/widget/recent/RecentListFactory.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/widget/recent/RecentListFactory.kt
@@ -37,7 +37,7 @@ class RecentListFactory(
 
 	override fun getLoadingView() = null
 
-	override fun getItemId(position: Int) = dataSet[position].id
+	override fun getItemId(position: Int) = dataSet.getOrNull(position)?.id ?: 0L
 
 	override fun onDataSetChanged() {
 		val data = runBlocking { historyRepository.getList(0, 10) }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/widget/shelf/ShelfListFactory.kt b/app/src/main/kotlin/org/koitharu/kotatsu/widget/shelf/ShelfListFactory.kt
index 14e15b967..38230a0df 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/widget/shelf/ShelfListFactory.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/widget/shelf/ShelfListFactory.kt
@@ -40,7 +40,7 @@ class ShelfListFactory(
 
 	override fun getLoadingView() = null
 
-	override fun getItemId(position: Int) = dataSet[position].id
+	override fun getItemId(position: Int) = dataSet.getOrNull(position)?.id ?: 0L
 
 	override fun onDataSetChanged() {
 		val data = runBlocking {