diff --git a/src/main.js b/src/main.js
index <HASH>..<HASH> 100644
--- a/src/main.js
+++ b/src/main.js
@@ -396,23 +396,14 @@ function configureCrashReporter() {
 	// Start crash reporter for all processes
 	const productName = (product.crashReporter ? product.crashReporter.productName : undefined) || product.nameShort;
 	const companyName = (product.crashReporter ? product.crashReporter.companyName : undefined) || 'Microsoft';
-	if (process.env['VSCODE_DEV']) {
-		crashReporter.start({
-			companyName: companyName,
-			productName: `${productName} Dev`,
-			submitURL,
-			uploadToServer: false,
-			compress: true
-		});
-	} else {
-		crashReporter.start({
-			companyName: companyName,
-			productName: productName,
-			submitURL,
-			uploadToServer: !crashReporterDirectory,
-			compress: true
-		});
-	}
+	const uploadToServer = !process.env['VSCODE_DEV'] && submitURL && !crashReporterDirectory;
+	crashReporter.start({
+		companyName,
+		productName: process.env['VSCODE_DEV'] ? `${productName} Dev` : productName,
+		submitURL,
+		uploadToServer,
+		compress: true
+	});
 }
 
 /**
crash reporter - fix runtime crash with invlid props (fix #<I>)

//cc @deepak<I>