diff --git a/src/sql/workbench/browser/modelComponents/hyperlink.component.ts b/src/sql/workbench/browser/modelComponents/hyperlink.component.ts
index 5817cea199..c6d0d6defb 100644
--- a/src/sql/workbench/browser/modelComponents/hyperlink.component.ts
+++ b/src/sql/workbench/browser/modelComponents/hyperlink.component.ts
@@ -21,7 +21,7 @@ import { ILogService } from 'vs/platform/log/common/log';
 
 @Component({
 	selector: 'modelview-hyperlink',
-	template: `<a [href]="url" [title]="title" [attr.aria-label]="ariaLabel" [attr.role]="ariaRole" target="blank" [ngStyle]="CSSStyles" [class]="cssClass">{{label}}</a>`
+	template: `<a [href]="url" [title]="getDisplayedTitle()" [attr.aria-label]="ariaLabel" [attr.role]="ariaRole" target="blank" [ngStyle]="CSSStyles" [class]="cssClass">{{label}}</a>`
 })
 export default class HyperlinkComponent extends TitledComponent<azdata.HyperlinkComponentProperties> implements IComponent, OnDestroy, AfterViewInit {
 	@Input() descriptor: IComponentDescriptor;
@@ -73,6 +73,10 @@ export default class HyperlinkComponent extends TitledComponent<azdata.Hyperlink
 		return this.getPropertyOrDefault<boolean>((props) => props.showLinkIcon, false);
 	}
 
+	public getDisplayedTitle(): string {
+		return this.title || this.url || '';
+	}
+
 	public onClick(e: MouseEvent): void {
 		this.fireEvent({
 			eventType: ComponentEventType.onDidClick,
diff --git a/src/vs/workbench/browser/media/style.css b/src/vs/workbench/browser/media/style.css
index 3f2f42901f..0b5d4a43b2 100644
--- a/src/vs/workbench/browser/media/style.css
+++ b/src/vs/workbench/browser/media/style.css
@@ -76,9 +76,11 @@ body.web {
 	cursor: pointer;
 }
 
+/* {{SQL CARBON EDIT}} Underline links
 .monaco-workbench a {
 	text-decoration: none;
 }
+*/
 
 .monaco-workbench a:active {
 	color: inherit;