diff --git a/app/src/main/java/net/pokeranalytics/android/ui/adapter/HistorySessionRowRepresentableAdapter.kt b/app/src/main/java/net/pokeranalytics/android/ui/adapter/HistorySessionRowRepresentableAdapter.kt
index d80db269..6e602693 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/adapter/HistorySessionRowRepresentableAdapter.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/adapter/HistorySessionRowRepresentableAdapter.kt
@@ -160,9 +160,9 @@ class HistorySessionRowRepresentableAdapter(
 
 		// Add headers if the date doesn't exist yet
 		for ((index, session) in realmResults.withIndex()) {
-			calendar.time = session.creationDate
+			calendar.time = session.startDate ?: session.creationDate
 			if (checkHeaderCondition(calendar, previousYear, previousMonth)) {
-				headersPositions[index + headersPositions.size + pendingRealmResults.size] = session.creationDate
+				headersPositions[index + headersPositions.size + pendingRealmResults.size] = session.startDate ?: session.creationDate
 				previousYear = calendar.get(Calendar.YEAR)
 				previousMonth = calendar.get(Calendar.MONTH)
 			}