diff --git a/packages/web/server/lib/git-service.js b/packages/web/server/lib/git-service.js
index 2299d02a..c1189c67 100644
--- a/packages/web/server/lib/git-service.js
+++ b/packages/web/server/lib/git-service.js
@@ -1064,6 +1064,12 @@ export async function removeWorktree(directory, worktreePath, options = {}) {
 
     return { success: true };
   } catch (error) {
+    // If the worktree doesn't exist or isn't recognized by git, treat as success
+    // since the goal (removing the worktree) is already achieved.
+    const errorMessage = String(error?.message || error || '');
+    if (errorMessage.includes('is not a working tree') || errorMessage.includes('is not a valid path')) {
+      return { success: true };
+    }
     console.error('Failed to remove worktree:', error);
     throw error;
   }