diff --git a/qemu/cpu-exec.c b/qemu/cpu-exec.c
index b74e8e87..4c1af312 100644
--- a/qemu/cpu-exec.c
+++ b/qemu/cpu-exec.c
@@ -294,8 +294,8 @@ static tcg_target_ulong cpu_tb_exec(CPUState *cpu, uint8_t *tb_ptr)
         TranslationBlock *tb = (TranslationBlock *)(next_tb & ~TB_EXIT_MASK);
         if (cc->synchronize_from_tb) {
             // avoid sync twice when helper_uc_tracecode() already did this.
-            if (env->uc->emu_counter <= env->uc->emu_count)
-                cc->synchronize_from_tb(cpu, tb);   // qq
+            if (env->uc->emu_counter <= env->uc->emu_count && !env->uc->stop_request)
+                cc->synchronize_from_tb(cpu, tb);
         } else {
             assert(cc->set_pc);
             // avoid sync twice when helper_uc_tracecode() already did this.
diff --git a/qemu/target-i386/translate.c b/qemu/target-i386/translate.c
index a920689c..efac8a6b 100644
--- a/qemu/target-i386/translate.c
+++ b/qemu/target-i386/translate.c
@@ -4774,11 +4774,8 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s,
             }
             // generate code to call callback
             gen_uc_tracecode(tcg_ctx, 0xf1f1f1f1, trace->callback, env->uc, pc_start, trace->user_data);
-            // if requested to emulate only some instructions, check if
-            // we need to exit immediately
-            if (env->uc->emu_count > 0) {
-                check_exit_request(tcg_ctx);
-            }
+            // the callback might want to stop emulation immediately
+            check_exit_request(tcg_ctx);
         }
     }