diff --git a/src/vs/workbench/api/electron-browser/mainThreadTask.ts b/src/vs/workbench/api/electron-browser/mainThreadTask.ts
index 2c21205fa1f..be7d48776f7 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadTask.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadTask.ts
@@ -44,6 +44,7 @@ export class MainThreadTask implements MainThreadTaskShape {
 						if (ContributedTask.is(task)) {
 							let uri = (task._source as any as ExtensionTaskSourceTransfer).__workspaceFolder;
 							if (uri) {
+								delete (task._source as any as ExtensionTaskSourceTransfer).__workspaceFolder;
 								(task._source as any).workspaceFolder = this._workspaceContextServer.getWorkspaceFolder(uri);
 							}
 						}
diff --git a/src/vs/workbench/api/node/extHostTask.ts b/src/vs/workbench/api/node/extHostTask.ts
index 1b544a298fa..60e89ff1ea6 100644
--- a/src/vs/workbench/api/node/extHostTask.ts
+++ b/src/vs/workbench/api/node/extHostTask.ts
@@ -341,6 +341,7 @@ namespace Tasks {
 		} else if (taskScope === types.TaskScope.Workspace) {
 			scope = TaskSystem.TaskScope.Workspace;
 		} else {
+			scope = TaskSystem.TaskScope.Folder;
 			workspaceFolder = taskScope;
 		}
 		let source: TaskSystem.ExtensionTaskSource = {