diff --git a/src/cpu/386.c b/src/cpu/386.c
index 0eae622e99..b5a1e61e3b 100644
--- a/src/cpu/386.c
+++ b/src/cpu/386.c
@@ -276,7 +276,7 @@ exec386_2386(int32_t cycs)
 #endif
                 opcode = fetchdat & 0xFF;
                 fetchdat >>= 8;
-                trap = cpu_state.flags & T_FLAG;
+                trap |= !!(cpu_state.flags & T_FLAG);
 
                 cpu_state.pc++;
                 x86_opcodes[(opcode | cpu_state.op32) & 0x3ff](fetchdat);
diff --git a/src/cpu/386_dynarec.c b/src/cpu/386_dynarec.c
index dcdb3c151f..ca2e60aea1 100644
--- a/src/cpu/386_dynarec.c
+++ b/src/cpu/386_dynarec.c
@@ -300,7 +300,7 @@ exec386_dynarec_int(void)
             opcode = fetchdat & 0xFF;
             fetchdat >>= 8;
 
-            trap |= cpu_state.flags & T_FLAG;
+            trap |= !!(cpu_state.flags & T_FLAG);
 
             cpu_state.pc++;
             x86_opcodes[(opcode | cpu_state.op32) & 0x3ff](fetchdat);
@@ -871,7 +871,7 @@ exec386(int32_t cycs)
 #endif
                 opcode = fetchdat & 0xFF;
                 fetchdat >>= 8;
-                trap |= cpu_state.flags & T_FLAG;
+                trap |= !!(cpu_state.flags & T_FLAG);
 
                 cpu_state.pc++;
                 x86_opcodes[(opcode | cpu_state.op32) & 0x3ff](fetchdat);
diff --git a/src/io.c b/src/io.c
index 3df413f9bd..d09b9c10fc 100644
--- a/src/io.c
+++ b/src/io.c
@@ -287,9 +287,6 @@ io_debug_check_addr(uint16_t addr)
     int i = 0;
     int set_trap = 0;
 
-    if (trap == 4)
-        return; /* Debug trap already pending. */
-
     if (!(dr[7] & 0xFF))
         return;
     
diff --git a/src/mem/mem.c b/src/mem/mem.c
index 567c176348..1ed1e81186 100644
--- a/src/mem/mem.c
+++ b/src/mem/mem.c
@@ -168,9 +168,6 @@ mem_debug_check_addr(uint32_t addr, int write)
     int i = 0;
     int set_trap = 0;
 
-    if (trap == 4)
-        return; /* Debug trap already pending. */
-
     if (!(dr[7] & 0xFF))
         return;