diff --git a/lib/workers/repository/update/branch/index.ts b/lib/workers/repository/update/branch/index.ts
index 62ed7989a7e469d238c922ae19eb0ce8e2f90a49..5b91b64490fb5d01c10076e67b69f5d483d952e7 100644
--- a/lib/workers/repository/update/branch/index.ts
+++ b/lib/workers/repository/update/branch/index.ts
@@ -532,9 +532,10 @@ export async function processBranch(
     if (commitSha) {
       const action = branchExists ? 'updated' : 'created';
       logger.info({ commitSha }, `Branch ${action}`);
+      // TODO #7154
       setCachedConflictResult(
-        config.defaultBranch!,
-        getBranchCommit(config.defaultBranch!)!,
+        config.baseBranch!,
+        getBranchCommit(config.baseBranch!)!,
         config.branchName,
         commitSha,
         false