diff --git a/apps/common/Gateway.js b/apps/common/Gateway.js
index bca4a0bc3..e36822565 100644
--- a/apps/common/Gateway.js
+++ b/apps/common/Gateway.js
@@ -135,7 +135,7 @@ if (Common === undefined) {
 
         var _onMessage = function(msg) {
             // TODO: check message origin
-            if (msg.origin !== window.parentOrigin) return;
+            if (msg.origin !== window.parentOrigin && msg.origin !== window.location.origin) return;
 
             var data = msg.data;
             if (Object.prototype.toString.apply(data) !== '[object String]' || !window.JSON) {