diff --git a/src/core/cpu_code_cache.cpp b/src/core/cpu_code_cache.cpp
index 7f311cc9d..6f1091e55 100644
--- a/src/core/cpu_code_cache.cpp
+++ b/src/core/cpu_code_cache.cpp
@@ -400,6 +400,7 @@ CodeBlock* LookupBlock(CodeBlockKey key)
 
 #ifdef WITH_RECOMPILER
     SetFastMap(block->GetPC(), block->host_code);
+    AddBlockToHostCodeMap(block);
 #endif
   }
   else
@@ -409,9 +410,7 @@ CodeBlock* LookupBlock(CodeBlockKey key)
     block = nullptr;
   }
 
-  iter = s_blocks.emplace(key.bits, block).first;
-  AddBlockToHostCodeMap(block);
-
+  s_blocks.emplace(key.bits, block);
   return block;
 }