diff --git a/src/sql/platform/connection/common/connectionProfile.ts b/src/sql/platform/connection/common/connectionProfile.ts
index 5abac0751c..b7df51acd4 100644
--- a/src/sql/platform/connection/common/connectionProfile.ts
+++ b/src/sql/platform/connection/common/connectionProfile.ts
@@ -192,6 +192,7 @@ export class ConnectionProfile extends ProviderConnectionInfo implements interfa
 	public cloneWithDatabase(databaseName: string): ConnectionProfile {
 		let instance = this.cloneWithNewId();
 		instance.databaseName = databaseName;
+		instance.originalDatabase = databaseName;
 		return instance;
 	}