diff --git a/src/apps/debugger/user_interface/gui/team_window/VariablesView.cpp b/src/apps/debugger/user_interface/gui/team_window/VariablesView.cpp
index 571399967b..15206ae8c8 100644
--- a/src/apps/debugger/user_interface/gui/team_window/VariablesView.cpp
+++ b/src/apps/debugger/user_interface/gui/team_window/VariablesView.cpp
@@ -888,9 +888,10 @@ VariablesView::VariableTableModel::ValueNodeChildrenCreated(
 			if (childNode != NULL)
 				fContainerListener->ModelNodeValueRequested(childNode);
 		}
-
-		fContainerListener->ModelNodeRestoreViewStateRequested(modelNode);
 	}
+
+	if (valueNode->ChildCreationNeedsValue())
+		fContainerListener->ModelNodeRestoreViewStateRequested(modelNode);
 }