diff --git a/src/state/selectors/canvases.js b/src/state/selectors/canvases.js
index ec49568e780b61625d41f0b70090a48abdf02229..e99027e389107fccc44dd5598b3b4f2c9f41fb0b 100644
--- a/src/state/selectors/canvases.js
+++ b/src/state/selectors/canvases.js
@@ -44,7 +44,11 @@ export const getCurrentCanvas = createSelector(
 
     if (!window.canvasId) return sequence.getCanvasByIndex(0);
 
-    return sequence.getCanvasById(window.canvasId);
+    const canvas = sequence.getCanvasById(window.canvasId);
+
+    if (!canvas) return sequence.getCanvasByIndex(0);
+
+    return canvas;
   },
 );