diff --git a/src/sql/workbench/services/connection/browser/connectionController.ts b/src/sql/workbench/services/connection/browser/connectionController.ts
index 17f45c2ec6..36ecd68614 100644
--- a/src/sql/workbench/services/connection/browser/connectionController.ts
+++ b/src/sql/workbench/services/connection/browser/connectionController.ts
@@ -112,10 +112,6 @@ export class ConnectionController implements IConnectionComponentController {
 		if (this._model.azureTenantId !== azureTenantId) {
 			this._model.azureTenantId = azureTenantId;
 		}
-
-		if (this._model.options.azureTenantId !== azureTenantId) {
-			this._model.azureTenantId = azureTenantId;
-		}
 	}
 
 	protected handleOnAdvancedProperties(): void {
diff --git a/src/sql/workbench/services/connection/browser/connectionWidget.ts b/src/sql/workbench/services/connection/browser/connectionWidget.ts
index 017d128e5c..aa21da6354 100644
--- a/src/sql/workbench/services/connection/browser/connectionWidget.ts
+++ b/src/sql/workbench/services/connection/browser/connectionWidget.ts
@@ -1091,9 +1091,6 @@ export class ConnectionWidget extends lifecycle.Disposable {
 						model.groupId = this.findGroupId(model.groupFullName);
 					}
 				}
-				if (this.authType === AuthenticationType.AzureMFA || this.authType === AuthenticationType.AzureMFAAndUser) {
-					model.azureTenantId = this._azureTenantId;
-				}
 			}
 		}
 		return validInputs;