diff --git a/components/lazdebuggers/lazdebuggerfp/fpdebugdebugger.pas b/components/lazdebuggers/lazdebuggerfp/fpdebugdebugger.pas
index 8ff0ba1edd..119595184a 100644
--- a/components/lazdebuggers/lazdebuggerfp/fpdebugdebugger.pas
+++ b/components/lazdebuggers/lazdebuggerfp/fpdebugdebugger.pas
@@ -2411,6 +2411,7 @@ begin
       exit;
     end;
   end;
+  FDebugger.FDbgController.DefaultContext; // Make sure it is avail and cached / so it can be called outside the thread
 
   if CurrentThread = nil then
     exit;
@@ -3810,7 +3811,8 @@ begin
     result.SrcLine:=0;
 
     if AnAddress=0 then
-      result.Address := FDbgController.CurrentThread.GetInstructionPointerRegisterValue
+      result.Address := FDbgController.DefaultContext.Address // DefaultContext has the InstrPtr cached
+      //result.Address := FDbgController.CurrentThread.GetInstructionPointerRegisterValue
     else
       result.Address := AnAddress;