diff --git a/src/vs/editor/contrib/format/format.ts b/src/vs/editor/contrib/format/format.ts
index 68d013e786a52a3f33c0a9112aa5361d3818909b..49c2198bf186c8fa28cb4c14d0f77a788e08a172 100644
--- a/src/vs/editor/contrib/format/format.ts
+++ b/src/vs/editor/contrib/format/format.ts
@@ -31,10 +31,10 @@ export const enum FormatKind {
 }
 
 export interface IFormatterConflictCallback {
-	(extensionIds: ExtensionIdentifier[], model: ITextModel, mode: number): void;
+	(extensionIds: (ExtensionIdentifier | undefined)[], model: ITextModel, mode: number): void;
 }
 
-let _conflictResolver: IFormatterConflictCallback;
+let _conflictResolver: IFormatterConflictCallback | undefined;
 
 export function setFormatterConflictCallback(callback: IFormatterConflictCallback): IDisposable {
 	let oldCallback = _conflictResolver;