diff --git a/app/src/lib/components/FileDiff.svelte b/app/src/lib/components/FileDiff.svelte
index 9d79a053d..492fc6c81 100644
--- a/app/src/lib/components/FileDiff.svelte
+++ b/app/src/lib/components/FileDiff.svelte
@@ -55,7 +55,7 @@
 					<div class="indicators text-base-11">
 						<span class="added">+{added}</span>
 						<span class="removed">-{removed}</span>
-						{#if section.hunk.lockedTo && commits}
+						{#if section.hunk.lockedTo && section.hunk.lockedTo.length > 0 && commits}
 							<div
 								use:tooltip={{
 									text: getLockText(section.hunk.lockedTo, commits),
diff --git a/app/src/lib/vbranches/tooltip.ts b/app/src/lib/vbranches/tooltip.ts
index 1ebacae7c..aac89ab00 100644
--- a/app/src/lib/vbranches/tooltip.ts
+++ b/app/src/lib/vbranches/tooltip.ts
@@ -9,8 +9,8 @@ export function getLockText(hunkLocks: HunkLock | HunkLock[] | string, commits:
 	const descriptions = locks
 		.filter(unique)
 		.map((lock) => {
-			const commit = commits.find((commit) => {
-				commit.id == lock.commitId;
+			const commit = commits.find((c) => {
+				return c.id == lock.commitId;
 			});
 			const shortCommitId = commit?.id.slice(0, 7);
 			if (commit) {