diff --git a/ElementX/Sources/Screens/MediaEventsTimelineScreen/MediaEventsTimelineScreenViewModel.swift b/ElementX/Sources/Screens/MediaEventsTimelineScreen/MediaEventsTimelineScreenViewModel.swift
index f6fac6078..a103a42a0 100644
--- a/ElementX/Sources/Screens/MediaEventsTimelineScreen/MediaEventsTimelineScreenViewModel.swift
+++ b/ElementX/Sources/Screens/MediaEventsTimelineScreen/MediaEventsTimelineScreenViewModel.swift
@@ -111,8 +111,10 @@ class MediaEventsTimelineScreenViewModel: MediaEventsTimelineScreenViewModelType
                 let group = MediaEventsTimelineGroup(id: item.id.uniqueID.id,
                                                      title: titleForDate(item.timestamp),
                                                      items: currentItems)
-                currentItems = []
-                newGroups.append(group)
+                if !currentItems.isEmpty {
+                    newGroups.append(group)
+                    currentItems = []
+                }
             } else {
                 currentItems.append(item)
             }