diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/ValueDescriptorImpl.java b/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/ValueDescriptorImpl.java
index 974ed25a4587..841bec75bf61 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/ValueDescriptorImpl.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/ValueDescriptorImpl.java
@@ -297,7 +297,7 @@ public abstract class ValueDescriptorImpl extends NodeDescriptorImpl implements
       ValueDescriptorImpl other = (ValueDescriptorImpl)oldDescriptor;
       if (other.isValueReady()) {
         myValue = other.getValue();
-        myInitFuture.complete(null);
+        // Do not mark myInitFuture as completed until the correct value is computed in #setContext
       }
     }
   }