diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerSession.java b/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerSession.java
index ace1ce1e15d8..4a879da56235 100644
--- a/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerSession.java
+++ b/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerSession.java
@@ -632,7 +632,9 @@ public class DebuggerSession implements AbstractDebuggerSession {
 
       final DebuggerContextImpl debuggerContext =
         DebuggerContextImpl.createDebuggerContext(DebuggerSession.this, suspendContext, currentThread, null);
-      debuggerContext.setPositionCache(position);
+      if (suspendContext.getThread() == currentThread) {
+        debuggerContext.setPositionCache(position);
+      }
 
       DebuggerInvocationUtil.invokeLater(getProject(), new Runnable() {
         @Override