diff --git a/src/ARMeilleure/State/ExecutionContext.cs b/src/ARMeilleure/State/ExecutionContext.cs
index 0b0a83c9f..5d8144d4e 100644
--- a/src/ARMeilleure/State/ExecutionContext.cs
+++ b/src/ARMeilleure/State/ExecutionContext.cs
@@ -169,6 +169,11 @@ namespace ARMeilleure.State
 
         internal void OnSupervisorCall(ulong address, int imm)
         {
+            if (Optimizations.EnableDebugging)
+            {
+                DebugPc = Pc; // TODO: Is this the best place to update DebugPc?
+            }
+
             _supervisorCallback?.Invoke(this, address, imm);
         }