diff --git a/src/apps/viewer/index.html b/src/apps/viewer/index.html
index b1607d28c09745cee1e7a2a4b8e8e0b9074523af..7c28bd24ac813386b80c6543f53f8beb7bae4a66 100644
--- a/src/apps/viewer/index.html
+++ b/src/apps/viewer/index.html
@@ -59,7 +59,7 @@
             if (snapshotId) viewer.setRemoteSnapshot(snapshotId);
 
             var snapshotUrl = getParam('snapshot-url', '[^&]+').trim();
-            var snapshotUrlType = getParam('snapshot-url-type', '[^&]+').toLowerCase().trim();
+            var snapshotUrlType = getParam('snapshot-url-type', '[^&]+').toLowerCase().trim() || 'molj';
             if (snapshotUrl && snapshotUrlType) viewer.loadSnapshotFromUrl(snapshotUrl, snapshotUrlType);
 
             var structureUrl = getParam('structure-url', '[^&]+').trim();
diff --git a/src/mol-plugin-state/manager/snapshots.ts b/src/mol-plugin-state/manager/snapshots.ts
index cd08c7d1a5d63f68bd08319b49d4da46d06ff860..0dea14c103a7ebc922c288b02ad777d78d6f4535 100644
--- a/src/mol-plugin-state/manager/snapshots.ts
+++ b/src/mol-plugin-state/manager/snapshots.ts
@@ -231,6 +231,8 @@ class PluginStateSnapshotManager extends StatefulPluginComponent<{
 
                 if (PluginStateSnapshotManager.isStateSnapshot(snapshot)) {
                     return this.setStateSnapshot(snapshot);
+                } else if (PluginStateSnapshotManager.isStateSnapshot(snapshot.data)) {
+                    return this.setStateSnapshot(snapshot.data);
                 } else {
                     this.plugin.state.setSnapshot(snapshot);
                 }
@@ -330,7 +332,7 @@ namespace PluginStateSnapshotManager {
         snapshot: PluginState.Snapshot
     }
 
-    export function Entry(snapshot: PluginState.Snapshot, params: {name?: string, description?: string }): Entry {
+    export function Entry(snapshot: PluginState.Snapshot, params: { name?: string, description?: string }): Entry {
         return { timestamp: +new Date(), snapshot, ...params };
     }