diff --git a/web/src/state/store.js b/web/src/state/store.js
index 0b63222..2fbc646 100644
--- a/web/src/state/store.js
+++ b/web/src/state/store.js
@@ -129,7 +129,24 @@ export let refresh_main_view = ({ before_execute } = {}) => {
 	return main_view_git_input_ref.value?.value?.execute({ before_execute })
 }
 
+let is_updating_commit_stats = false
+/** @type {Commit[]} */
+let queued_commits_for_update_stats = []
 export let update_commit_stats = async (/** @type {Commit[]} */ commits_) => {
+	if (is_updating_commit_stats)
+		return queued_commits_for_update_stats.push(...commits_)
+	is_updating_commit_stats = true
+	await work_update_commit_stats(commits_)
+	is_updating_commit_stats = false
+	if (queued_commits_for_update_stats.length) {
+		update_commit_stats(queued_commits_for_update_stats.filter(c => ! c.stats))
+		queued_commits_for_update_stats = []
+	}
+}
+/** Can be *very* slow in very big repos so it's important to keep it to a minimum */
+async function work_update_commit_stats(/** @type {Commit[]} */ commits_) {
+	if (! commits_.length)
+		return
 	let data = await git('show --format="%h" --shortstat ' + commits_.map((c) => c.hash).join(' '))
 	if (! data)
 		return
@@ -274,7 +291,8 @@ export let init = () => {
 	git_log('log --graph --author-date-order --date=iso-local --pretty={EXT_FORMAT} -n 100 --all --color=never',
 		{ fetch_stash_refs: false, fetch_branches: false }).then((parsed) =>
 		commits.value = parsed.commits
-			.concat({ subject: '..........Loading more..........', author_email: '', hash: '-', index_in_graph_output: -1, vis_lines: [{ y0: 0.5, yn: 0.5, x0: 0, xn: 2000, branch: { color: 'yellow', type: 'branch', name: '', id: '' } }], author_name: '', hash_long: '', refs: [] }))
+			.concat({ subject: '..........Loading more..........', author_email: '', hash: '-', index_in_graph_output: -1, vis_lines: [{ y0: 0.5, yn: 0.5, x0: 0, xn: 2000, branch: { color: 'yellow', type: 'branch', name: '', id: '' } }], author_name: '', hash_long: '', refs: [] })
+			.map(c => ({ ...c, stats: /* to prevent loading them */ { files_changed: 0, insertions: 0, deletions: 0 } })))
 
 	add_push_listener('config-change', async () => {
 		await refresh_config()
diff --git a/web/src/views/CommitFileChanges.vue b/web/src/views/CommitFileChanges.vue
index 84d0930..38571cc 100644
--- a/web/src/views/CommitFileChanges.vue
+++ b/web/src/views/CommitFileChanges.vue
@@ -91,6 +91,7 @@ import { stateful_computed, refresh_main_view } from '../state/store.js'
 import { createReusableTemplate } from '@vueuse/core'
 import file_extension_icon_path_mapping from '../state/file-extension-icon-path-mapping.json'
 
+// TODO: share/extend type and component with commit.stats?
 /**
  * @typedef {{
  *	path: string
diff --git a/web/src/views/CommitRow.vue b/web/src/views/CommitRow.vue
index ecd2243..666bed6 100644
--- a/web/src/views/CommitRow.vue
+++ b/web/src/views/CommitRow.vue
@@ -15,14 +15,16 @@
 				{{ commit.author_name }}
 			</div>
 			<div class="stats flex-noshrink row align-center justify-flex-end gap-5">
-				<div v-if="commit.stats" class="changes" title="Changed lines in amount of files">
-					<span>
-						<strong>{{ commit.stats.insertions + commit.stats.deletions }}</strong>
-					</span>
-					<span class="grey"> in</span>
-					<span class="grey">{{ commit.stats.files_changed }}</span>
-				</div>
-				<progress v-if="commit.stats" :value="(commit.stats.insertions / (commit.stats.insertions + commit.stats.deletions)) || 0" class="diff" title="Ratio insertions / deletions" />
+				<template v-if="commit.stats?.files_changed">
+					<div class="changes" title="Changed lines in amount of files">
+						<span>
+							<strong>{{ commit.stats.insertions + commit.stats.deletions }}</strong>
+						</span>
+						<span class="grey"> in </span>
+						<span class="grey">{{ commit.stats.files_changed }}</span>
+					</div>
+					<progress :value="(commit.stats.insertions / (commit.stats.insertions + commit.stats.deletions)) || 0" class="diff" title="Ratio insertions / deletions" />
+				</template>
 			</div>
 			<div class="datetime flex-noshrink align-center">
 				{{ commit.datetime }}
diff --git a/web/src/views/MainView.vue b/web/src/views/MainView.vue
index fcbaa24..37bc41c 100644
--- a/web/src/views/MainView.vue
+++ b/web/src/views/MainView.vue
@@ -328,7 +328,7 @@ let scroll_item_height = computed(() =>
 	store.config.value['row-height'])
 
 watch(visible_commits, async () => {
-	let visible_cp = [...visible_commits.value].filter((commit) => // to avoid race conditions
+	let visible_cp = visible_commits.value.filter((commit) =>
 		commit.hash && ! commit.stats)
 	if (! visible_cp.length)
 		return