diff --git a/src/demon/win32/demon_core_win32.c b/src/demon/win32/demon_core_win32.c
index 2d39e0fe..90ff1abc 100644
--- a/src/demon/win32/demon_core_win32.c
+++ b/src/demon/win32/demon_core_win32.c
@@ -1981,7 +1981,7 @@ dmn_ctrl_run(Arena *arena, DMN_CtrlCtx *ctx, DMN_RunCtrls *ctrls)
             }
             
             //- rjf: determine whether to roll back instruction pointer
-            B32 should_do_rollback = (hit_user_trap);
+            B32 should_do_rollback = (hit_user_trap || (is_trap && !hit_explicit_trap));
             
             //- rjf: roll back thread's instruction pointer
             U64 post_trap_rip = 0;