diff --git a/src/vs/code/electron-main/windows.ts b/src/vs/code/electron-main/windows.ts
index 617bb7dd415fc84b1b6578364889ec55aba6c117..265860ff016285da42f6bd7093d58a526b4f56c9 100644
--- a/src/vs/code/electron-main/windows.ts
+++ b/src/vs/code/electron-main/windows.ts
@@ -767,7 +767,9 @@ export class WindowsManager implements IWindowsMainService {
 			}
 		}
 
-		this.backupService.registerWindowForBackups(vscodeWindow.id, !configuration.workspacePath, emptyWorkspaceBackupFolder, configuration.workspacePath);
+		if (!configuration.extensionDevelopmentPath) {
+			this.backupService.registerWindowForBackups(vscodeWindow.id, !configuration.workspacePath, emptyWorkspaceBackupFolder, configuration.workspacePath);
+		}
 
 		// Only load when the window has not vetoed this
 		this.lifecycleService.unload(vscodeWindow, UnloadReason.LOAD).done(veto => {
diff --git a/src/vs/platform/backup/electron-main/backupMainService.ts b/src/vs/platform/backup/electron-main/backupMainService.ts
index 4bd560aa302dde39294db910aa6de3fde11d6f02..be03ef9f72490cc456a1016ada9a6dafdc2ea282 100644
--- a/src/vs/platform/backup/electron-main/backupMainService.ts
+++ b/src/vs/platform/backup/electron-main/backupMainService.ts
@@ -51,11 +51,6 @@ export class BackupMainService implements IBackupMainService {
 	}
 
 	public registerWindowForBackups(windowId: number, isEmptyWorkspace: boolean, backupFolder?: string, workspacePath?: string): void {
-		// Backups and hot exit are disabled during extension development
-		if (this.environmentService.isExtensionDevelopment) {
-			return;
-		}
-
 		// Generate a new folder if this is a new empty workspace
 		if (!backupFolder) {
 			backupFolder = Date.now().toString();