diff --git a/src/vs/workbench/services/themes/electron-browser/themeService.ts b/src/vs/workbench/services/themes/electron-browser/themeService.ts
index 69d56e15eb34cf5964114d45af68b68151536c59..eccf86e1471de1c6d40ee13c6b708a292e04b9fd 100644
--- a/src/vs/workbench/services/themes/electron-browser/themeService.ts
+++ b/src/vs/workbench/services/themes/electron-browser/themeService.ts
@@ -338,18 +338,15 @@ export class ThemeService implements IThemeService {
 		if (legacyColorThemeId || legacyIconThemeId) {
 			this.storageService.remove('workbench.theme', StorageScope.GLOBAL);
 			this.storageService.remove('workbench.iconTheme', StorageScope.GLOBAL);
-			return Promise.join([
-				this.findThemeData(legacyColorThemeId, DEFAULT_THEME_ID).then(theme => {
-					let themeId = theme ? theme.id : DEFAULT_THEME_ID;
-					let target = themeId !== DEFAULT_THEME_ID ? ConfigurationTarget.USER : null;
-					return this.setColorTheme(themeId, target);
-				}),
-				this._findIconThemeData(legacyIconThemeId).then(theme => {
-					let themeId = theme && theme.id;
-					let target = themeId !== DEFAULT_THEME_ID ? ConfigurationTarget.USER : null;
-					return this.setFileIconTheme(themeId, target);
-				})
-			]);
+			return this.findThemeData(legacyColorThemeId, DEFAULT_THEME_ID).then(theme => {
+				let themeId = theme ? theme.id : DEFAULT_THEME_ID;
+				return this.setColorTheme(themeId, ConfigurationTarget.USER).then(_ => {
+					return this._findIconThemeData(legacyIconThemeId).then(theme => {
+						let themeId = theme && theme.id;
+						return this.setFileIconTheme(themeId, ConfigurationTarget.USER);
+					});
+				});
+			});
 		}