diff --git a/src/ctrl/ctrl_core.c b/src/ctrl/ctrl_core.c
index f88516c7..b20a2409 100644
--- a/src/ctrl/ctrl_core.c
+++ b/src/ctrl/ctrl_core.c
@@ -1737,11 +1737,6 @@ ctrl_thread__entry_point(void *p)
     //- rjf: get next messages
     CTRL_MsgList msgs = ctrl_u2c_pop_msgs(scratch.arena);
     
-    //- rjf: enable stuck-thread-step behavior in all cases - can be silently enabled by launch_and_init for subsequent messages
-    {
-      ctrl_state->disable_stuck_thread_step = 0;
-    }
-    
     //- rjf: process messages
     DMN_CtrlExclusiveAccessScope
     {
@@ -2503,11 +2498,7 @@ ctrl_thread__run(DMN_CtrlCtx *ctrl_ctx, CTRL_Msg *msg)
   // the user breakpoint.
   //
   B32 target_thread_is_on_user_bp_and_trap_net_trap = 0;
-  if(ctrl_state->disable_stuck_thread_step)
-  {
-    ctrl_state->disable_stuck_thread_step = 0;
-  }
-  else if(stop_event == 0 && !ctrl_state->disable_stuck_thread_step)
+  if(stop_event == 0)
   {
     // rjf: gather stuck threads
     DMN_HandleList stuck_threads = {0};
diff --git a/src/ctrl/ctrl_core.h b/src/ctrl/ctrl_core.h
index 88321132..2ceee4c4 100644
--- a/src/ctrl/ctrl_core.h
+++ b/src/ctrl/ctrl_core.h
@@ -530,7 +530,6 @@ struct CTRL_State
   String8List user_entry_points;
   U64 exception_code_filters[(CTRL_ExceptionCodeKind_COUNT+63)/64];
   U64 process_counter;
-  B32 disable_stuck_thread_step;
   
   // rjf: user -> memstream ring buffer
   U64 u2ms_ring_size;