diff --git a/index.html b/index.html
index 08b4c5774..5a5462381 100755
--- a/index.html
+++ b/index.html
@@ -832,7 +832,7 @@
       clearOnRender: 0,
 
       storageManager:{
-        autoload: 0,
+        autoload: 1,
         storeComponents: 1,
         storeStyles: 1,
       },
@@ -1292,7 +1292,6 @@
       },
     });
 
-    /*
     // Store and load events
     editor.on('storage:load', function(e) {
       console.log('LOAD ', e);
@@ -1300,7 +1299,6 @@
     editor.on('storage:store', function(e) {
       console.log('STORE ', e);
     })
-    */
 
     editor.render();
     </script>
diff --git a/src/asset_manager/index.js b/src/asset_manager/index.js
index d02df0e38..04903521a 100644
--- a/src/asset_manager/index.js
+++ b/src/asset_manager/index.js
@@ -185,7 +185,10 @@ module.exports = () => {
         assets = JSON.parse(d[name]);
       }catch(err){}
 
-      this.getAll().reset(assets);
+      if (assets && assets.length) {
+        this.getAll().reset(assets);
+      }
+
       return assets;
     },