diff --git a/src/vs/code/electron-browser/issue/issueReporterModel.ts b/src/vs/code/electron-browser/issue/issueReporterModel.ts
index d2cf4fcb04c..72e1a81ff20 100644
--- a/src/vs/code/electron-browser/issue/issueReporterModel.ts
+++ b/src/vs/code/electron-browser/issue/issueReporterModel.ts
@@ -104,7 +104,7 @@ ${this.getInfos()}
 		let info = '';
 
 		if (this._data.issueType === IssueType.Bug || this._data.issueType === IssueType.PerformanceIssue) {
-			if (this._data.includeSystemInfo) {
+			if (this._data.includeSystemInfo && this._data.systemInfo) {
 				info += this.generateSystemInfoMd();
 			}
 		}
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 e05574577d0..bce21da282b 100644
--- a/src/vs/code/electron-browser/issue/test/testReporterModel.test.ts
+++ b/src/vs/code/electron-browser/issue/test/testReporterModel.test.ts
@@ -13,27 +13,29 @@ suite('IssueReporter', () => {
 	test('sets defaults to include all data', () => {
 		const issueReporterModel = new IssueReporterModel();
 		assert.deepEqual(issueReporterModel.getData(), {
+			allExtensions: [],
 			includeSystemInfo: true,
 			includeWorkspaceInfo: true,
 			includeProcessInfo: true,
 			includeExtensions: true,
 			includeSearchedExtensions: true,
-			includeSettingsSearchDetails: true
+			includeSettingsSearchDetails: true,
+			issueType: 0
 		});
 	});
 
 	test('serializes model skeleton when no data is provided', () => {
-		const issueReporterModel = new IssueReporterModel();
+		const issueReporterModel = new IssueReporterModel({});
 		assert.equal(issueReporterModel.serialize(),
 			`
-Issue Type: <b>Feature Request</b>
+Issue Type: <b>Bug</b>
 
 undefined
 
 VS Code version: undefined
 OS version: undefined
 
-
+Extensions: none
 <!-- generated by issue reporter -->`);
 	});