diff --git a/cli/cli.go b/cli/cli.go
index 5f902be87..33ca27276 100644
--- a/cli/cli.go
+++ b/cli/cli.go
@@ -101,6 +101,7 @@ func NewCommand(logdest logger.Logger) *Command {
 
 			OrganizationID: "",
 			Database:       "",
+			DatabaseID:     "",
 
 			CloudAuth: CloudAuthConfig{
 				ClientID: defaultClientID,
@@ -376,6 +377,7 @@ func (cmd *Command) setupConfig() error {
 
 	cmd.organizationID = cmd.Config.OrganizationID
 	cmd.database = cmd.Config.Database
+	cmd.databaseID = cmd.Config.DatabaseID
 
 	cmd.historyPath = cmd.Config.HistoryPath
 
@@ -487,6 +489,12 @@ func (cmd *Command) connectToDatabase(dbName string) error {
 		p = newNopPrinter()
 	}
 
+	if cmd.databaseID != "" {
+		cmd.databaseName = "(set by id)"
+		p.Printf(cmd.connectionMessage())
+		return nil
+	}
+
 	if dbName == "" {
 		cmd.databaseID = ""
 		cmd.databaseName = ""
diff --git a/cli/config.go b/cli/config.go
index 6d9722871..dac2a5434 100644
--- a/cli/config.go
+++ b/cli/config.go
@@ -7,6 +7,7 @@ type Config struct {
 
 	OrganizationID string `json:"org-id"`
 	Database       string `json:"db"`
+	DatabaseID     string `json:"db-id"`
 
 	// CloudAuth
 	CloudAuth CloudAuthConfig `json:"cloud-auth"`
diff --git a/cmd/fbsql/main.go b/cmd/fbsql/main.go
index 2ffe057a5..3077e58f9 100644
--- a/cmd/fbsql/main.go
+++ b/cmd/fbsql/main.go
@@ -52,6 +52,7 @@ func buildFlags(cmd *cobra.Command, cliCmd *cli.Command) {
 	flags.StringVar(&cliCmd.Config.HistoryPath, "history-path", cliCmd.Config.HistoryPath, "path for history files.")
 	flags.StringVar(&cliCmd.Config.OrganizationID, "org-id", cliCmd.Config.OrganizationID, "OrganizationID.")
 	flags.StringVarP(&cliCmd.Config.Database, "dbname", "d", cliCmd.Config.Database, "Name of the database to connect to.")
+	flags.StringVarP(&cliCmd.Config.DatabaseID, "db-id", "", cliCmd.Config.DatabaseID, "ID of the database to connect to (TEMPORARY).")
 
 	flags.StringVar(&cliCmd.Config.CloudAuth.ClientID, "client-id", cliCmd.Config.CloudAuth.ClientID, "Cognito Client ID for FeatureBase Cloud access.")
 	flags.StringVar(&cliCmd.Config.CloudAuth.Region, "region", cliCmd.Config.CloudAuth.Region, "Cloud region for FeatureBase Cloud access (e.g. us-east-2).")