diff --git a/libs/remix-debug/src/solidity-decoder/solidityProxy.ts b/libs/remix-debug/src/solidity-decoder/solidityProxy.ts
index 92a8712565..528b9e8437 100644
--- a/libs/remix-debug/src/solidity-decoder/solidityProxy.ts
+++ b/libs/remix-debug/src/solidity-decoder/solidityProxy.ts
@@ -60,7 +60,7 @@ export class SolidityProxy {
       this.cache.contractDeclarations[address] = extractContractDefinitions(compilationResult.data.sources)
     }
     if (!this.cache.statesDefinitions[address]) {
-      this.cache.statesDefinitions[address] = extractStatesDefinitions(compilationResult.data.sources, this.cache.contractDeclarations)
+      this.cache.statesDefinitions[address] = extractStatesDefinitions(compilationResult.data.sources, this.cache.contractDeclarations[address])
     }
     return this.cache.statesDefinitions[address]
   }