diff --git a/client/mapping-sync/src/kv/mod.rs b/client/mapping-sync/src/kv/mod.rs
index 5aea3c7a5b..03cafe6a40 100644
--- a/client/mapping-sync/src/kv/mod.rs
+++ b/client/mapping-sync/src/kv/mod.rs
@@ -186,6 +186,16 @@ where
 		current_syncing_tips.append(&mut leaves);
 	}
 
+	let best_hash = client.info().best_hash;
+	if SyncStrategy::Parachain == strategy
+		&& !frontier_backend
+			.mapping()
+			.is_synced(&best_hash)?
+	{
+		// Add best block to current_syncing_tips
+		current_syncing_tips.push(best_hash);
+	}
+
 	let mut operating_header = None;
 	while let Some(checking_tip) = current_syncing_tips.pop() {
 		if let Some(checking_header) = fetch_header(