diff --git a/server/modules/protocol/mysql_client.c b/server/modules/protocol/mysql_client.c
index d2ccb0a8f..b2ae7e020 100644
--- a/server/modules/protocol/mysql_client.c
+++ b/server/modules/protocol/mysql_client.c
@@ -687,7 +687,7 @@ int gw_read_client_event(DCB* dcb) {
                         /* close client connection */
                         (dcb->func).close(dcb);
                         rc = 1;
-                        goto return_rc;
+                        return rc;
                 }
                 
                 /* MySQL Command Routing */