diff --git a/CHANGELOG.md b/CHANGELOG.md
index ce6bb3f0e..4f57e4f78 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ You can also check [on GitHub](https://github.com/nextcloud/news/releases), the
 ### Changed
 
 ### Fixed
+- fix undefined item when using `j` and `k` keyboards shortcuts in an empty feed (#2689)
 
 # Releases
 ## [25.0.0-alpha7] - 2024-06-10
diff --git a/src/components/feed-display/FeedItemDisplayList.vue b/src/components/feed-display/FeedItemDisplayList.vue
index b66a1bcd7..c9291f6fd 100644
--- a/src/components/feed-display/FeedItemDisplayList.vue
+++ b/src/components/feed-display/FeedItemDisplayList.vue
@@ -196,6 +196,10 @@ export default Vue.extend({
 		},
 		// Trigger the click event programmatically to benefit from the item handling inside the FeedItemRow component
 		clickItem(item: FeedItem, alignToTop = false) {
+			if (!item) {
+				return
+			}
+
 			const refName = 'feedItemRow' + item.id
 			const ref = this.$refs[refName]
 			// Make linter happy