diff --git a/package.json b/package.json
index ad74d725b5..c5018ffd14 100644
--- a/package.json
+++ b/package.json
@@ -156,6 +156,11 @@
 					],
 					"default": "enabled",
 					"description": "Control MCP server functionality and its inclusion in AI prompts. When disabled, Cline will not be aware of MCP capabilities, saving model context window tokens."
+				},
+				"cline.enableCheckpoints": {
+					"type": "boolean",
+					"default": true,
+					"description": "Enable checkpoint creation during task execution"
 				}
 			}
 		}
diff --git a/src/integrations/checkpoints/CheckpointTracker.ts b/src/integrations/checkpoints/CheckpointTracker.ts
index 472ff9ed78..75758e8d63 100644
--- a/src/integrations/checkpoints/CheckpointTracker.ts
+++ b/src/integrations/checkpoints/CheckpointTracker.ts
@@ -21,12 +21,18 @@ class CheckpointTracker {
 		this.cwd = cwd
 	}
 
-	public static async create(taskId: string, provider?: ClineProvider): Promise<CheckpointTracker> {
+	public static async create(taskId: string, provider?: ClineProvider): Promise<CheckpointTracker | undefined> {
 		try {
 			if (!provider) {
 				throw new Error("Provider is required to create a checkpoint tracker")
 			}
 
+			// Check if checkpoints are disabled in VS Code settings
+			const enableCheckpoints = vscode.workspace.getConfiguration("cline").get<boolean>("enableCheckpoints") ?? true
+			if (!enableCheckpoints) {
+				return undefined // Don't create tracker when disabled
+			}
+
 			// Check if git is installed by attempting to get version
 			try {
 				await simpleGit().version()