diff --git a/src/services/file-changes/FCOMessageHandler.ts b/src/services/file-changes/FCOMessageHandler.ts
index 95f550a079..ceb54064a5 100644
--- a/src/services/file-changes/FCOMessageHandler.ts
+++ b/src/services/file-changes/FCOMessageHandler.ts
@@ -413,7 +413,7 @@ export class FCOMessageHandler {
 
 		// Detect enable event (transition from false to true) during active task
 		if (!previousFilesChangedEnabled && filesChangedEnabled) {
-			const currentTask = this.provider.getCurrentCline()
+			const currentTask = this.provider.getCurrentTask()
 			if (currentTask && currentTask.taskId) {
 				try {
 					await this.handleFCOEnableResetBaseline(currentTask)
diff --git a/src/services/file-changes/__tests__/FCOMessageHandler.test.ts b/src/services/file-changes/__tests__/FCOMessageHandler.test.ts
index 15d22fa5c0..5195ceb59e 100644
--- a/src/services/file-changes/__tests__/FCOMessageHandler.test.ts
+++ b/src/services/file-changes/__tests__/FCOMessageHandler.test.ts
@@ -75,7 +75,9 @@ describe("FCOMessageHandler", () => {
 		vi.clearAllMocks()
 
 		// Setup getCheckpointService mock
-		vi.mocked(getCheckpointService).mockImplementation((task) => task?.checkpointService || undefined)
+		vi.mocked(getCheckpointService).mockImplementation((task) =>
+			Promise.resolve(task?.checkpointService || undefined),
+		)
 
 		// Reset checkpointSave mock
 		vi.mocked(checkpointSave).mockReset()