diff --git a/src/app/features/message-search/useMessageSearch.ts b/src/app/features/message-search/useMessageSearch.ts
index c89cdb41..ded6d4b7 100644
--- a/src/app/features/message-search/useMessageSearch.ts
+++ b/src/app/features/message-search/useMessageSearch.ts
@@ -55,9 +55,9 @@ const parseSearchResult = (result: ISearchResponse): SearchResult => {
   const roomEvents = result.search_categories.room_events;
 
   const searchResult: SearchResult = {
-    nextToken: roomEvents.next_batch,
-    highlights: roomEvents.highlights,
-    groups: groupSearchResult(roomEvents.results),
+    nextToken: roomEvents?.next_batch,
+    highlights: roomEvents?.highlights ?? [],
+    groups: groupSearchResult(roomEvents?.results ?? []),
   };
 
   return searchResult;