diff --git a/src/vs/workbench/contrib/preferences/electron-browser/settingsEditor2.ts b/src/vs/workbench/contrib/preferences/electron-browser/settingsEditor2.ts
index 4ddcaa1c19..4058ac0ba6 100644
--- a/src/vs/workbench/contrib/preferences/electron-browser/settingsEditor2.ts
+++ b/src/vs/workbench/contrib/preferences/electron-browser/settingsEditor2.ts
@@ -258,6 +258,11 @@ export class SettingsEditor2 extends BaseEditor {
 	}
 
 	private _setOptions(options: SettingsEditorOptions): void {
+		// {{SQL CARBON EDIT}} - return if options is undefined to avoid nullref
+		if (!options) {
+			return;
+		}
+
 		if (options.query) {
 			this.searchWidget.setValue(options.query);
 		}