diff --git a/apps/desktop/src/lib/components/BaseBranch.svelte b/apps/desktop/src/lib/components/BaseBranch.svelte
index 56510a3ec..1fe91d35d 100644
--- a/apps/desktop/src/lib/components/BaseBranch.svelte
+++ b/apps/desktop/src/lib/components/BaseBranch.svelte
@@ -67,8 +67,8 @@
 			style="pop"
 			kind="solid"
 			tooltip={`Merges the commits from ${base.branchName} into the base of all applied virtual branches`}
-			disabled={$mode?.type !== 'OpenWorkspace' || integrateUpstreamModal.imports.open}
-			loading={integrateUpstreamModal.imports.open}
+			disabled={$mode?.type !== 'OpenWorkspace' || integrateUpstreamModal?.imports.open}
+			loading={integrateUpstreamModal?.imports.open}
 			onclick={mergeUpstream}
 		>
 			Merge into common base