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 b31f8250ca..2e01387671 100644
--- a/src/apps/debugger/user_interface/gui/team_window/VariablesView.cpp
+++ b/src/apps/debugger/user_interface/gui/team_window/VariablesView.cpp
@@ -940,10 +940,10 @@ VariablesView::VariableTableModel::SetStackFrame(Thread* thread,
 		fNodes.MakeEmpty();
 	}
 
-	if (stackFrame == NULL) {
-		NotifyNodesRemoved(TreeTablePath(), 0, count);
+	NotifyNodesRemoved(TreeTablePath(), 0, count);
+
+	if (stackFrame == NULL)
 		return;
-	}
 
 	ValueNodeContainer* container = fNodeManager->GetContainer();
 	AutoLocker<ValueNodeContainer> containerLocker(container);
@@ -956,8 +956,6 @@ VariablesView::VariableTableModel::SetStackFrame(Thread* thread,
 		// so those won't invoke our callback hook. Add them directly here.
 		ValueNodeChildrenCreated(child->Node());
 	}
-
-	NotifyTableModelReset();
 }