diff --git a/lib/singlepass-backend/src/codegen_x64.rs b/lib/singlepass-backend/src/codegen_x64.rs
index 1b081717a..08320d149 100644
--- a/lib/singlepass-backend/src/codegen_x64.rs
+++ b/lib/singlepass-backend/src/codegen_x64.rs
@@ -1904,11 +1904,12 @@ impl FunctionCodeGenerator<CodegenError> for X64FunctionCode {
             Event::Internal(x) => {
                 match x {
                     InternalEvent::Breakpoint(callback) => {
-                        a.emit_bkpt();
+                        use wasmer_runtime_core::backend::InlineBreakpointType;
                         self.breakpoints
                             .as_mut()
                             .unwrap()
                             .insert(a.get_offset(), callback);
+                        a.emit_inline_breakpoint(InlineBreakpointType::Middleware);
                     }
                     InternalEvent::FunctionBegin(_) | InternalEvent::FunctionEnd => {}
                     InternalEvent::GetInternal(idx) => {
diff --git a/lib/singlepass-backend/src/emitter_x64.rs b/lib/singlepass-backend/src/emitter_x64.rs
index 41134473a..d16c87233 100644
--- a/lib/singlepass-backend/src/emitter_x64.rs
+++ b/lib/singlepass-backend/src/emitter_x64.rs
@@ -1,5 +1,6 @@
 use dynasmrt::{x64::Assembler, AssemblyOffset, DynamicLabel, DynasmApi, DynasmLabelApi};
 pub use wasmer_runtime_core::state::x64_decl::{GPR, XMM};
+use wasmer_runtime_core::backend::{InlineBreakpointType};
 
 #[derive(Copy, Clone, Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
 pub enum Location {
@@ -171,6 +172,7 @@ pub trait Emitter {
     fn emit_bkpt(&mut self);
 
     fn emit_homomorphic_host_redirection(&mut self, target: GPR);
+    fn emit_inline_breakpoint(&mut self, ty: InlineBreakpointType);
 }
 
 fn _dummy(a: &mut Assembler) {
@@ -951,4 +953,13 @@ impl Emitter for Assembler {
     fn emit_homomorphic_host_redirection(&mut self, target: GPR) {
         self.emit_jmp_location(Location::GPR(target));
     }
+
+    fn emit_inline_breakpoint(&mut self, ty: InlineBreakpointType) {
+        dynasm!(self
+            ; ud2
+            ; .byte 0x0f ; .byte (0xb9u8 as i8) // ud
+            ; int -1
+            ; .byte (ty as u8 as i8)
+        );
+    }
 }
diff --git a/lib/singlepass-backend/src/translator_aarch64.rs b/lib/singlepass-backend/src/translator_aarch64.rs
index 107a290e9..3ae27ddd8 100644
--- a/lib/singlepass-backend/src/translator_aarch64.rs
+++ b/lib/singlepass-backend/src/translator_aarch64.rs
@@ -3,6 +3,7 @@
 use crate::codegen_x64::*;
 use crate::emitter_x64::*;
 use dynasmrt::{aarch64::Assembler, AssemblyOffset, DynamicLabel, DynasmApi, DynasmLabelApi};
+use wasmer_runtime_core::backend::{InlineBreakpointType};
 
 #[derive(Debug, PartialEq, Eq, Hash, Clone, Copy)]
 pub struct AX(pub u32);
@@ -1474,6 +1475,14 @@ impl Emitter for Assembler {
             ; br x_tmp1
         );
     }
+
+    fn emit_inline_breakpoint(&mut self, ty: InlineBreakpointType) {
+        dynasm!(self
+            ; .dword 0
+            ; .dword -1
+            ; .dword (ty as u8 as i32)
+        );
+    }
 }
 
 fn emit_clz_variant(assembler: &mut Assembler, sz: Size, src: &Location, dst: &Location, reversed: bool) {