diff --git a/src/engine_render.c b/src/engine_render.c
index 148d0eeb9b..27e812dfeb 100644
--- a/src/engine_render.c
+++ b/src/engine_render.c
@@ -8960,6 +8960,8 @@ static void do_map_who(short tnglist_idx)
         if (k > THINGS_COUNT)
         {
             ERRORLOG("Infinite loop detected when sweeping things list");
+            struct Map* mapblk = get_map_block_at(thing->mappos.x.stl.num, thing->mappos.y.stl.num);
+            break_mapwho_infinite_chain(mapblk);
             break;
         }
     }