diff --git a/src/WidgetMessaging.js b/src/WidgetMessaging.js
index 9db88ae441..4b50b21626 100644
--- a/src/WidgetMessaging.js
+++ b/src/WidgetMessaging.js
@@ -175,8 +175,9 @@ if (!global.mxWidgetMessagingMessageEndpoints) {
 }
 
 export default class WidgetMessaging extends MatrixPostMessageApi {
-    constructor(targetWindow) {
+    constructor(widgetId, targetWindow) {
         super(targetWindow);
+        this.widgetId = widgetId;
     }
 
     exec(action) {
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 8032b9d76b..2fbb30ff90 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -334,11 +334,11 @@ export default React.createClass({
      */
     _onLoaded() {
         // console.warn("App frame", this.refs.appFrame.contentWindow);
-        this.widgetMessaging = new WidgetMessaging(this.refs.appFrame.contentWindow);
+        this.widgetMessaging = new WidgetMessaging(this.props.id, this.refs.appFrame.contentWindow);
         this.widgetMessaging.startListening();
         this.widgetMessaging.addEndpoint(this.props.id, this.props.url);
         this.widgetMessaging.getCapabilities().then((capabilities) => {
-            console.log("Got widget capabilities", this.widgetId, capabilities);
+            console.log("Got widget capabilities", this.props.id, capabilities);
             capabilities = capabilities || [];
             this.setState({capabilities});
         }).catch((err) => {