diff --git a/src/redis-cli.c b/src/redis-cli.c
index ef1d49e3e..3930a2d8e 100644
--- a/src/redis-cli.c
+++ b/src/redis-cli.c
@@ -819,6 +819,9 @@ static int cliConnect(int flags) {
     if (context == NULL || flags & CC_FORCE) {
         if (context != NULL) {
             redisFree(context);
+            config.dbnum = 0;
+            config.in_multi = 0;
+            cliRefreshPrompt();
         }
 
         if (config.hostsocket == NULL) {