diff --git a/src/vs/code/electron-browser/issue/issueReporterMain.ts b/src/vs/code/electron-browser/issue/issueReporterMain.ts
index dce948d5427..c0344399ded 100644
--- a/src/vs/code/electron-browser/issue/issueReporterMain.ts
+++ b/src/vs/code/electron-browser/issue/issueReporterMain.ts
@@ -76,17 +76,11 @@ export class IssueReporter extends Disposable {
 
 		this.issueReporterModel = new IssueReporterModel({
 			issueType: configuration.data.issueType || IssueType.Bug,
-			includeSystemInfo: true,
-			includeWorkspaceInfo: true,
-			includeProcessInfo: true,
-			includeSearchedExtensions: true,
-			includeSettingsSearchDetails: true,
 			versionInfo: {
 				vscodeVersion: `${pkg.name} ${pkg.version} (${product.commit || 'Commit unknown'}, ${product.date || 'Date unknown'})`,
 				os: `${os.type()} ${os.arch()} ${os.release()}`
 			},
 			extensionsDisabled: this.environmentService.disableExtensions,
-			reprosWithoutExtensions: false
 		});
 
 		this.features = configuration.features;
diff --git a/src/vs/code/electron-browser/issue/issueReporterModel.ts b/src/vs/code/electron-browser/issue/issueReporterModel.ts
index 4ae150e9651..642011b3156 100644
--- a/src/vs/code/electron-browser/issue/issueReporterModel.ts
+++ b/src/vs/code/electron-browser/issue/issueReporterModel.ts
@@ -38,7 +38,17 @@ export class IssueReporterModel {
 	private _data: IssueReporterData;
 
 	constructor(initialData?: IssueReporterData) {
-		this._data = initialData || {};
+		const defaultData = {
+			includeSystemInfo: true,
+			includeWorkspaceInfo: true,
+			includeProcessInfo: true,
+			includeExtensions: true,
+			includeSearchedExtensions: true,
+			includeSettingsSearchDetails: true,
+			reprosWithoutExtensions: false
+		};
+
+		this._data = initialData ? assign(defaultData, initialData) : defaultData;
 	}
 
 	getData(): IssueReporterData {
diff --git a/src/vs/code/electron-browser/issue/test/testReporterModel.test.ts b/src/vs/code/electron-browser/issue/test/testReporterModel.test.ts
index 2b7caaf6254..f9a885220cb 100644
--- a/src/vs/code/electron-browser/issue/test/testReporterModel.test.ts
+++ b/src/vs/code/electron-browser/issue/test/testReporterModel.test.ts
@@ -10,7 +10,20 @@ import { IssueReporterModel } from 'vs/code/electron-browser/issue/issueReporter
 
 suite('IssueReporter', () => {
 
-	test('serializes model', () => {
+	test('sets defaults to include all data', () => {
+		const issueReporterModel = new IssueReporterModel();
+		assert.deepEqual(issueReporterModel.getData(), {
+			includeSystemInfo: true,
+			includeWorkspaceInfo: true,
+			includeProcessInfo: true,
+			includeExtensions: true,
+			includeSearchedExtensions: true,
+			includeSettingsSearchDetails: true,
+			reprosWithoutExtensions: false
+		});
+	});
+
+	test('serializes model skeleton when no data is provided', () => {
 		const issueReporterModel = new IssueReporterModel();
 		assert.equal(issueReporterModel.serialize(),
 			`