diff --git a/src/avatar.cpp b/src/avatar.cpp
index ac91701475aa2..0be573752611e 100644
--- a/src/avatar.cpp
+++ b/src/avatar.cpp
@@ -1257,6 +1257,9 @@ bool avatar::cant_see( const tripoint_bub_ms &p )
 
 void avatar::rebuild_aim_cache()
 {
+    aim_cache_dirty =
+        false; // Can trigger recursive death spiral if still set when calc_steadiness is called.
+
     double pi = 2 * acos( 0.0 );
 
     const tripoint local_last_target = get_map().bub_from_abs( last_target_pos.value() ).raw();
@@ -1311,7 +1314,6 @@ void avatar::rebuild_aim_cache()
     }
 
     // set cache as no longer dirty
-    aim_cache_dirty = false;
 }
 
 void avatar::set_movement_mode( const move_mode_id &new_mode )