diff --git a/include/TimelineView.h b/include/TimelineView.h
index dbc73bbf..297dffcf 100644
--- a/include/TimelineView.h
+++ b/include/TimelineView.h
@@ -110,6 +110,7 @@ private:
 	bool isPaginationInProgress_ = false;
 	bool isInitialized = false;
 	bool isTimelineFinished = false;
+	bool isInitialSync = true;
 
 	const int SCROLL_BAR_GAP = 300;
 
diff --git a/src/TimelineView.cc b/src/TimelineView.cc
index 9f80db66..aec519ed 100644
--- a/src/TimelineView.cc
+++ b/src/TimelineView.cc
@@ -219,7 +219,10 @@ int TimelineView::addEvents(const Timeline &timeline)
 {
 	int message_count = 0;
 
-	prev_batch_token_ = timeline.previousBatch();
+	if (isInitialSync) {
+		prev_batch_token_ = timeline.previousBatch();
+		isInitialSync = false;
+	}
 
 	for (const auto &event : timeline.events()) {
 		TimelineItem *item = parseMessageEvent(event.toObject(), TimelineDirection::Bottom);