diff --git a/src/sql/workbench/services/connection/browser/connectionManagementService.ts b/src/sql/workbench/services/connection/browser/connectionManagementService.ts
index 0b3a02ccd4..bb35ddec01 100644
--- a/src/sql/workbench/services/connection/browser/connectionManagementService.ts
+++ b/src/sql/workbench/services/connection/browser/connectionManagementService.ts
@@ -480,6 +480,10 @@ export class ConnectionManagementService extends Disposable implements IConnecti
 				profile.userName = accounts?.find(a => a.key.accountId === profile.azureAccount)?.displayInfo.displayName
 					?? profile.userName;
 			}
+			// This is used to specify whether a connection is server level or database level
+			if (profile.databaseName !== 'master' || !profile.databaseName) {
+				profile.options.originalDatabase = profile.databaseName
+			}
 		}
 		return profile;
 	}