diff --git a/src/core/checkpoints/index.ts b/src/core/checkpoints/index.ts
index 05549be0f9..83aefe56b5 100644
--- a/src/core/checkpoints/index.ts
+++ b/src/core/checkpoints/index.ts
@@ -42,7 +42,7 @@ export async function getCheckpointService(
 	console.log("[Task#getCheckpointService] initializing checkpoints service")
 
 	try {
-		const workspaceDir = getWorkspacePath()
+		const workspaceDir = cline.cwd || getWorkspacePath()
 
 		if (!workspaceDir) {
 			log("[Task#getCheckpointService] workspace folder not found, disabling checkpoints")