diff --git a/target/riscv/translate.c b/target/riscv/translate.c
index 0b6be74f2dd1cc31520c7fa85044babae867de57..ec2988b4f66fe7f92a5f317daadac85873d54404 100644
--- a/target/riscv/translate.c
+++ b/target/riscv/translate.c
@@ -135,7 +135,7 @@ static void gen_goto_tb(DisasContext *ctx, int n, target_ulong dest)
         if (ctx->base.singlestep_enabled) {
             gen_exception_debug();
         } else {
-            tcg_gen_exit_tb(NULL, 0);
+            tcg_gen_lookup_and_goto_ptr();
         }
     }
 }