diff --git a/qemu/target-i386/unicorn.c b/qemu/target-i386/unicorn.c
index e1642aea..a72af6fb 100644
--- a/qemu/target-i386/unicorn.c
+++ b/qemu/target-i386/unicorn.c
@@ -35,6 +35,8 @@ void x86_release(void *ctx)
     int i;
     TCGContext *s = (TCGContext *) ctx;
 
+    cpu_breakpoint_remove_all(s->uc->cpu, BP_CPU);
+
     release_common(ctx);
 
     // arch specific