diff --git a/cmd/baton-databricks/main.go b/cmd/baton-databricks/main.go
index 1fa18ca8..a89b6d85 100644
--- a/cmd/baton-databricks/main.go
+++ b/cmd/baton-databricks/main.go
@@ -58,7 +58,7 @@ func prepareClientAuth(ctx context.Context, cfg *viper.Viper) databricks.Auth {
 	password := cfg.GetString(config.PasswordField.FieldName)
 	workspaces := cfg.GetStringSlice(config.WorkspacesField.FieldName)
 	tokens := cfg.GetStringSlice(config.TokensField.FieldName)
-	accountHostname := databricks.GetAccountHostname(cfg)
+	accountHostname := databricks.GetAccountHostname(databricks.GetHostname(cfg))
 
 	switch {
 	case username != "" && password != "":
@@ -109,7 +109,7 @@ func getConnector(ctx context.Context, cfg *viper.Viper) (types.ConnectorServer,
 	}
 
 	hostname := databricks.GetHostname(cfg)
-	accountHostname := databricks.GetAccountHostname(cfg)
+	accountHostname := databricks.GetAccountHostname(databricks.GetHostname(cfg))
 	auth := prepareClientAuth(ctx, cfg)
 	cb, err := connector.New(
 		ctx,
diff --git a/pkg/databricks/client.go b/pkg/databricks/client.go
index 401dc400..070a4c9a 100644
--- a/pkg/databricks/client.go
+++ b/pkg/databricks/client.go
@@ -54,13 +54,13 @@ func GetHostname(cfg *viper.Viper) string {
 	return cfg.GetString(config.HostnameField.FieldName)
 }
 
-func GetAccountHostname(cfg *viper.Viper) string {
-	if strings.HasSuffix(GetHostname(cfg), azureHost) {
+func GetAccountHostname(hostname string) string {
+	if strings.HasSuffix(hostname, azureHost) {
 		return "accounts." + azureHost
-	} else if strings.HasSuffix(GetHostname(cfg), gcpHost) {
+	} else if strings.HasSuffix(hostname, gcpHost) {
 		return "accounts." + gcpHost
 	}
-	return "accounts." + GetHostname(cfg)
+	return "accounts." + hostname
 }
 
 func NewClient(ctx context.Context, httpClient *http.Client, hostname, accountHostname, accountID string, auth Auth) (*Client, error) {