diff --git a/irdb-libs/ir_builders/fill_in_indtargs.cpp b/irdb-libs/ir_builders/fill_in_indtargs.cpp
index 5edfa0583745a66294d32bcaaece5bb873975455..1fa973a40f44f4d5254b8d6c401609923b888d19 100644
--- a/irdb-libs/ir_builders/fill_in_indtargs.cpp
+++ b/irdb-libs/ir_builders/fill_in_indtargs.cpp
@@ -2845,6 +2845,11 @@ V2:
                          << intermediate_write_instr->getDisassembly() << "' @ 0x"
                          << hex << intermediate_write_instr->getAddress()->getVirtualOffset() << endl;
                 }
+                // We have hit a dead end for now, restore initial state
+                // This is probably a move from memory, where the index was compared in memory
+                // or before moving it to memory (an example is shown in the known issues list below)
+                // TODO: Think about handling this case
+                search_start_instr = table_load_instruction;
             }
         }