diff --git a/package.json b/package.json
index 5893b1d09aa0..d6ed6310dd4e 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "@kadira/storybook-addon-actions": "^1.0.2",
     "@kadira/storybook-addon-links": "^1.0.0",
     "@kadira/storybook-addons": "^1.5.0",
-    "@kadira/storybook-channel-postmsg": "^1.1.0",
+    "@kadira/storybook-channel-postmsg": "^2.0.0",
     "@kadira/storybook-ui": "^3.8.0",
     "airbnb-js-shims": "^1.0.1",
     "autoprefixer": "^6.3.7",
diff --git a/src/client/manager/provider.js b/src/client/manager/provider.js
index cedb583acf21..98baa37e4dc6 100644
--- a/src/client/manager/provider.js
+++ b/src/client/manager/provider.js
@@ -11,7 +11,7 @@ import Preview from './preview';
 export default class ReactProvider extends Provider {
   constructor() {
     super();
-    this.channel = createChannel();
+    this.channel = createChannel({ page: 'manager' });
     addons.setChannel(this.channel);
   }
 
diff --git a/src/client/preview/index.js b/src/client/preview/index.js
index 7f3f0c8cfd08..f0f3b706fa2e 100644
--- a/src/client/preview/index.js
+++ b/src/client/preview/index.js
@@ -22,7 +22,7 @@ const context = { storyStore, reduxStore };
 
 if (isBrowser) {
   const queryParams = qs.parse(window.location.search.substring(1));
-  const channel = createChannel();
+  const channel = createChannel({ page: 'preview' });
   channel.on('setCurrentStory', (data) => {
     reduxStore.dispatch(selectStory(data.kind, data.story));
   });