diff --git a/source/client/components/CVSetup.ts b/source/client/components/CVSetup.ts
index caf1e37b..3779f8fd 100644
--- a/source/client/components/CVSetup.ts
+++ b/source/client/components/CVSetup.ts
@@ -140,10 +140,6 @@ export default class CVSetup extends Component
                 this[name].fromData(featureData);
             }
         }
-
-        if (setupData.snapshots) {
-            this.snapshots.fromData(setupData.snapshots, pathMap);
-        }
     }
 
     toDocument(document: IDocument, sceneIndex: number, pathMap: Map<Component, string>)
diff --git a/source/client/nodes/NVScene.ts b/source/client/nodes/NVScene.ts
index cab9a1d1..fbc99884 100644
--- a/source/client/nodes/NVScene.ts
+++ b/source/client/nodes/NVScene.ts
@@ -69,6 +69,11 @@ export default class NVScene extends NVNode
                 childNode.fromDocument(document, nodeIndex, pathMap);
             });
         }
+
+        const setupData = document.setups[scene.setup];
+        if (setupData.snapshots) {
+            this.setup.snapshots.fromData(setupData.snapshots, pathMap);
+        }
     }
 
     toDocument(document: IDocument, pathMap: Map<Component, string>, components?: INodeComponents): number