diff --git a/src/sql/workbench/contrib/query/browser/query.contribution.ts b/src/sql/workbench/contrib/query/browser/query.contribution.ts
index 8bed264a89..e55ddd3716 100644
--- a/src/sql/workbench/contrib/query/browser/query.contribution.ts
+++ b/src/sql/workbench/contrib/query/browser/query.contribution.ts
@@ -530,7 +530,10 @@ export class QueryEditorOverrideContribution extends Disposable implements IWork
 					label: QueryEditor.LABEL,
 					priority: RegisteredEditorPriority.builtin
 				},
-				{},
+				{
+					// Fall back to using the normal text based diff editor - we don't want the query bar and related items showing up in the diff editor
+					canHandleDiff: () => false
+				},
 				(editorInput, group) => {
 					const fileInput = this._editorService.createEditorInput(editorInput) as FileEditorInput;
 					const langAssociation = languageAssociationRegistry.getAssociationForLanguage(lang);