diff --git a/src/state/selectors/ranges.js b/src/state/selectors/ranges.js
index 6ed958040f5c1cbf131d6f870fe9ffc8f6fcfb01..0a40388874a82176fc62b62320bf212d66510679 100644
--- a/src/state/selectors/ranges.js
+++ b/src/state/selectors/ranges.js
@@ -61,7 +61,7 @@ const getVisibleLeafAndBranchNodeIds = createSelector(
     getVisibleCanvasIds,
   ],
   (tree, canvasIds) => {
-    if (canvasIds.length === 0) return [];
+    if (canvasIds.length === 0 || !tree) return [];
     return getVisibleNodeIdsInSubTree(tree.nodes, canvasIds);
   },
 );