diff --git a/.changeset/nine-cameras-applaud.md b/.changeset/nine-cameras-applaud.md
new file mode 100644
index 00000000000..4a02007f8e5
--- /dev/null
+++ b/.changeset/nine-cameras-applaud.md
@@ -0,0 +1,5 @@
+---
+"roo-cline": patch
+---
+
+Disable repo-per-workspace checkpoints
diff --git a/src/core/Cline.ts b/src/core/Cline.ts
index e9353c0c776..51fb5265d41 100644
--- a/src/core/Cline.ts
+++ b/src/core/Cline.ts
@@ -3688,10 +3688,14 @@ export class Cline {
 				log,
 			}
 
-			const service =
-				this.checkpointStorage === "task"
-					? RepoPerTaskCheckpointService.create(options)
-					: RepoPerWorkspaceCheckpointService.create(options)
+			// Only `task` is supported at the moment until we figure out how
+			// to fully isolate the `workspace` variant.
+			// const service =
+			// 	this.checkpointStorage === "task"
+			// 		? RepoPerTaskCheckpointService.create(options)
+			// 		: RepoPerWorkspaceCheckpointService.create(options)
+
+			const service = RepoPerTaskCheckpointService.create(options)
 
 			service.on("initialize", () => {
 				try {
diff --git a/webview-ui/src/components/settings/CheckpointSettings.tsx b/webview-ui/src/components/settings/CheckpointSettings.tsx
index 56d5377b180..fa3b9138323 100644
--- a/webview-ui/src/components/settings/CheckpointSettings.tsx
+++ b/webview-ui/src/components/settings/CheckpointSettings.tsx
@@ -1,8 +1,8 @@
 import { HTMLAttributes } from "react"
-import { VSCodeCheckbox, VSCodeRadio, VSCodeRadioGroup } from "@vscode/webview-ui-toolkit/react"
+import { VSCodeCheckbox } from "@vscode/webview-ui-toolkit/react"
 import { GitBranch } from "lucide-react"
 
-import { CheckpointStorage, isCheckpointStorage } from "../../../../src/shared/checkpoints"
+import { CheckpointStorage } from "../../../../src/shared/checkpoints"
 
 import { SetCachedStateField } from "./types"
 import { SectionHeader } from "./SectionHeader"
@@ -42,39 +42,6 @@ export const CheckpointSettings = ({
 						When enabled, Roo will automatically create checkpoints during task execution, making it easy to
 						review changes or revert to earlier states.
 					</p>
-					{enableCheckpoints && (
-						<div>
-							<div className="font-medium">Storage</div>
-							<VSCodeRadioGroup
-								role="radiogroup"
-								value={checkpointStorage}
-								onChange={(e) => {
-									if ("target" in e) {
-										const { value } = e.target as HTMLInputElement
-
-										if (isCheckpointStorage(value)) {
-											setCachedStateField("checkpointStorage", value)
-										}
-									}
-								}}>
-								<VSCodeRadio value="task">Task</VSCodeRadio>
-								<VSCodeRadio value="workspace">Workspace</VSCodeRadio>
-							</VSCodeRadioGroup>
-							{checkpointStorage === "task" && (
-								<p className="text-vscode-descriptionForeground text-sm mt-0">
-									Each task will have it's own dedicated git repository for storing checkpoints. This
-									provides the best isolation between tasks but uses more disk space.
-								</p>
-							)}
-							{checkpointStorage === "workspace" && (
-								<p className="text-vscode-descriptionForeground text-sm mt-0">
-									Each VSCode workspace will have it's own dedicated git repository for storing
-									checkpoints and tasks within a workspace will share this repository. This option
-									provides better performance and disk space efficiency.
-								</p>
-							)}
-						</div>
-					)}
 				</div>
 			</Section>
 		</div>