diff --git a/pkg/cli/cli.go b/pkg/cli/cli.go
index a31a14a..d6eecba 100644
--- a/pkg/cli/cli.go
+++ b/pkg/cli/cli.go
@@ -65,7 +65,6 @@ func initClient() {
 	} else {
 		cl, err = client.New()
 	}
-
 	if err != nil {
 		exitWithMessage(err.Error())
 	}
@@ -75,12 +74,11 @@ func initClient() {
 	}
 
 	fmt.Println("Connecting to server...")
-	err = cl.Test()
-	if err != nil {
+	if err := cl.Test(); err != nil {
 		msg := err.Error()
 
 		// Check if we're trying to connect to the default database.
-		if command.Opts.DbName == "" {
+		if command.Opts.DbName == "" && command.Opts.Url == "" {
 			// If database does not exist, allow user to connect from the UI.
 			if strings.Contains(msg, "database") && strings.Contains(msg, "does not exist") {
 				fmt.Println("Error:", msg)