diff --git a/teamapps-ux/src/main/java/org/teamapps/ux/component/tree/SimpleTree.java b/teamapps-ux/src/main/java/org/teamapps/ux/component/tree/SimpleTree.java
index 941d97007..880db7972 100644
--- a/teamapps-ux/src/main/java/org/teamapps/ux/component/tree/SimpleTree.java
+++ b/teamapps-ux/src/main/java/org/teamapps/ux/component/tree/SimpleTree.java
@@ -73,10 +73,14 @@ public void relocateNode(BaseTemplateTreeNode<PAYLOAD> node) {
 
 	public void removeNode(BaseTemplateTreeNode<PAYLOAD> node) {
 		getModel().removeNode(node);
+		if (node == getSelectedNode()) {
+			setNoSelectedNode();
+		}
 	}
 
 	public void removeAllNodes() {
 		getModel().removeAllNodes();
+		setNoSelectedNode();
 	}
 
 	public SimpleTreeModel<PAYLOAD> getModel() {
@@ -95,4 +99,8 @@ public void setTemplatesByDepth(Template... templatesByDepth) {
 	public void setEntryTemplate(Template entryTemplate) {
 		setTemplatesByDepth(entryTemplate);
 	}
+
+	public void setNoSelectedNode() {
+		setSelectedNode(null);
+	}
 }