diff --git a/app/src/main/java/be/ugent/sel/studeez/domain/implementation/FirebaseFeedDAO.kt b/app/src/main/java/be/ugent/sel/studeez/domain/implementation/FirebaseFeedDAO.kt
index 600153a..79e4e68 100644
--- a/app/src/main/java/be/ugent/sel/studeez/domain/implementation/FirebaseFeedDAO.kt
+++ b/app/src/main/java/be/ugent/sel/studeez/domain/implementation/FirebaseFeedDAO.kt
@@ -22,10 +22,14 @@ class FirebaseFeedDAO @Inject constructor(
         return sessionDAO.getSessions().map {sessionReports ->
             sessionReports
                 .map { sessionReport ->  sessionToFeedEntry(sessionReport) }
-                .groupBy { it.taskId }
-                .map { fuseFeedEntries(it.component2()) }
                 .sortedByDescending { it.endTime }
                 .groupBy { getFormattedTime(it) }
+                .mapValues { (_, entries) ->
+                    entries
+                    .groupBy { it.taskId }
+                    .map { fuseFeedEntries(it.component2()) }
+                    .sortedByDescending { it.endTime }
+                }
         }
     }