diff --git a/src/lr35902/isa-lr35902.c b/src/lr35902/isa-lr35902.c
index 99db5a713..5f8022c33 100644
--- a/src/lr35902/isa-lr35902.c
+++ b/src/lr35902/isa-lr35902.c
@@ -189,8 +189,9 @@ DEFINE_CONDITIONAL_INSTRUCTION_LR35902(RET)
 #define DEFINE_LDHL__INSTRUCTION_LR35902(NAME, OPERAND) \
 	DEFINE_INSTRUCTION_LR35902(LDHL_ ## NAME, \
 		cpu->bus = OPERAND; \
+		cpu->index = LR35902ReadHL(cpu); \
 		cpu->executionState = LR35902_CORE_MEMORY_STORE; \
-		cpu->instruction = _LR35902InstructionLDHL_Bus;)
+		cpu->instruction = _LR35902InstructionNOP;)
 
 #define DEFINE_LDA__INSTRUCTION_LR35902(NAME, OPERAND) \
 	DEFINE_INSTRUCTION_LR35902(LDA_ ## NAME, \