diff --git a/CHANGELOG.md b/CHANGELOG.md
index be7d737..2b55a77 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 Previous changes not listed in this document can be traced using Git history.
 
+## [1.0.23] - 2026-04-28
+
+### Fixed
+- Fixed crash in `Notifications` when reaching end of event list
+
 ## [1.0.22] - 2026-04-27
 
 ### Added
diff --git a/src/hooks/useGetEvents.ts b/src/hooks/useGetEvents.ts
index 766eaa7..1c021eb 100644
--- a/src/hooks/useGetEvents.ts
+++ b/src/hooks/useGetEvents.ts
@@ -160,8 +160,16 @@ export function useGetEvents({
 
     const merged = [...sseEvents, ...fetchedEvents]
     const seen = new Set<string>()
+
     return merged.filter((item) => {
-      if (seen.has(item.global_uid)) { return false }
+      if (!item || !item.global_uid) {
+        return false
+      }
+
+      if (seen.has(item.global_uid)) {
+        return false
+      }
+
       seen.add(item.global_uid)
       return true
     })