diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/XValueContainerNode.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/XValueContainerNode.java
index a2fb3d51d253..5a7c4bb6d0d8 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/XValueContainerNode.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/XValueContainerNode.java
@@ -187,14 +187,14 @@ public abstract class XValueContainerNode<ValueContainer extends XValueContainer
                                                                     myTemporaryMessageChildren != null ? myTemporaryMessageChildren : Collections.<MessageTreeNode>emptyList());
     final int[] indices = getNodesIndices(allMessageChildren);
     final TreeNode[] nodes = getChildNodes(indices);
-    myMessageChildren = null;
-    myTemporaryMessageChildren = null;
     fireNodesRemoved(indices, nodes);
     if (!temporary) {
       myMessageChildren = messages;
+      myTemporaryMessageChildren = null;
     }
     else {
       myTemporaryMessageChildren = messages;
+      myMessageChildren = null;
     }
     myCachedAllChildren = null;
     fireNodesInserted(messages);