diff --git a/public/app/plugins/panel/canvas/module.tsx b/public/app/plugins/panel/canvas/module.tsx
index 75566872d8b..e6fa75a7256 100644
--- a/public/app/plugins/panel/canvas/module.tsx
+++ b/public/app/plugins/panel/canvas/module.tsx
@@ -66,7 +66,7 @@ export const plugin = new PanelPlugin<Options>(CanvasPanel)
 
     addStandardCanvasEditorOptions(builder);
 
-    if (state) {
+    if (state && state.scene) {
       builder.addNestedOptions(getLayerEditor(state));
 
       const selection = state.selected;