diff --git a/server/modules/protocol/MySQL/mariadbclient/mysql_client.cc b/server/modules/protocol/MySQL/mariadbclient/mysql_client.cc
index 577bf867b..428654b7e 100644
--- a/server/modules/protocol/MySQL/mariadbclient/mysql_client.cc
+++ b/server/modules/protocol/MySQL/mariadbclient/mysql_client.cc
@@ -1575,7 +1575,7 @@ static bool reauthenticate_client(MXS_SESSION* session, GWBUF* packetbuf)
  */
 static int route_by_statement(MXS_SESSION* session, uint64_t capabilities, GWBUF** p_readbuf)
 {
-    int rc;
+    int rc = 1;
     GWBUF* packetbuf;
     do
     {
@@ -1682,6 +1682,7 @@ static int route_by_statement(MXS_SESSION* session, uint64_t capabilities, GWBUF
                 // Store the original COM_CHANGE_USER for later
                 proto->stored_query = packetbuf;
                 packetbuf = NULL;
+                rc = 1;
             }
             else if (proto->changing_user)
             {