diff --git a/src/Ui/media/Wrapper.coffee b/src/Ui/media/Wrapper.coffee
index 2989de70..11a544a2 100644
--- a/src/Ui/media/Wrapper.coffee
+++ b/src/Ui/media/Wrapper.coffee
@@ -380,8 +380,9 @@ class Wrapper
 
 
 	actionSetLocalStorage: (message) ->
-		back = localStorage.setItem "site.#{@site_info.address}.#{@site_info.auth_address}", JSON.stringify(message.params)
-		@sendInner {"cmd": "response", "to": message.id, "result": back}
+		$.when(@event_site_info).done =>
+			back = localStorage.setItem "site.#{@site_info.address}.#{@site_info.auth_address}", JSON.stringify(message.params)
+			@sendInner {"cmd": "response", "to": message.id, "result": back}
 
 
 	# EOF actions
diff --git a/src/Ui/media/all.js b/src/Ui/media/all.js
index 6e1a28c5..643b234e 100644
--- a/src/Ui/media/all.js
+++ b/src/Ui/media/all.js
@@ -540,7 +540,6 @@ $.extend( $.easing,
 }).call(this);
 
 
-
 /* ---- src/Ui/media/Loading.coffee ---- */
 
 
@@ -1384,13 +1383,17 @@ $.extend( $.easing,
     };
 
     Wrapper.prototype.actionSetLocalStorage = function(message) {
-      var back;
-      back = localStorage.setItem("site." + this.site_info.address + "." + this.site_info.auth_address, JSON.stringify(message.params));
-      return this.sendInner({
-        "cmd": "response",
-        "to": message.id,
-        "result": back
-      });
+      return $.when(this.event_site_info).done((function(_this) {
+        return function() {
+          var back;
+          back = localStorage.setItem("site." + _this.site_info.address + "." + _this.site_info.auth_address, JSON.stringify(message.params));
+          return _this.sendInner({
+            "cmd": "response",
+            "to": message.id,
+            "result": back
+          });
+        };
+      })(this));
     };
 
     Wrapper.prototype.onOpenWebsocket = function(e) {
@@ -1688,6 +1691,7 @@ $.extend( $.easing,
 }).call(this);
 
 
+
 /* ---- src/Ui/media/WrapperZeroFrame.coffee ---- */