diff --git a/src/pages/Zone/Card/ZoneLocationsTree.vue b/src/pages/Zone/Card/ZoneLocationsTree.vue
index f924a2e21..cea9e654c 100644
--- a/src/pages/Zone/Card/ZoneLocationsTree.vue
+++ b/src/pages/Zone/Card/ZoneLocationsTree.vue
@@ -27,8 +27,11 @@ const nodes = ref([
 const previousExpandedNodes = ref(new Set());
 
 const onNodeExpanded = async (nodeKeysArray) => {
-    const nodeKeysSet = new Set(nodeKeysArray);
+    let nodeKeysSet = new Set(nodeKeysArray);
     const lastNodeKey = nodeKeysArray.at(-1);
+
+    if (!nodeKeysSet.has(null)) return;
+
     const wasExpanded = !previousExpandedNodes.value.has(lastNodeKey);
     if (wasExpanded) await fetchNodeLeaves(lastNodeKey);
     else {
@@ -40,7 +43,6 @@ const onNodeExpanded = async (nodeKeysArray) => {
         const allNodeIds = getNodeIds(node);
         expanded.value = expanded.value.filter((id) => !allNodeIds.includes(id));
     }
-
     previousExpandedNodes.value = nodeKeysSet;
 };