diff --git a/plugins/talk-plugin-global-switchoff/client/components/GlobalSwitchoff.js b/plugins/talk-plugin-global-switchoff/client/components/GlobalSwitchoff.js
index a5150ed10..d676e7531 100644
--- a/plugins/talk-plugin-global-switchoff/client/components/GlobalSwitchoff.js
+++ b/plugins/talk-plugin-global-switchoff/client/components/GlobalSwitchoff.js
@@ -1,9 +1,7 @@
 import React from 'react';
-import { gql } from 'react-apollo';
 import ConfigureCard from 'coral-framework/components/ConfigureCard';
 import MarkdownEditor from 'coral-framework/components/MarkdownEditor';
 import t from 'coral-framework/services/i18n';
-import { withFragments } from 'plugin-api/beta/client/hocs';
 import cn from 'classnames';
 import styles from './styles.css';
 
@@ -47,13 +45,4 @@ class GlobalSwitchoff extends React.Component {
   }
 }
 
-// export default GlobalSwitchoff;
-
-export default withFragments({
-  settings: gql`
-    fragment TalkPlugin_GlobalSwitchoff_settings on Settings {
-      globalSwitchoffEnable
-      globalSwitchoffMessage
-    }
-  `,
-})(GlobalSwitchoff);
+export default GlobalSwitchoff;
diff --git a/plugins/talk-plugin-global-switchoff/client/containers/GlobalSwitchoff.js b/plugins/talk-plugin-global-switchoff/client/containers/GlobalSwitchoff.js
new file mode 100644
index 000000000..b935bcb5a
--- /dev/null
+++ b/plugins/talk-plugin-global-switchoff/client/containers/GlobalSwitchoff.js
@@ -0,0 +1,12 @@
+import { gql } from 'react-apollo';
+import GlobalSwitchoff from '../components/GlobalSwitchoff';
+import { withFragments } from 'plugin-api/beta/client/hocs';
+
+export default withFragments({
+  settings: gql`
+    fragment TalkPlugin_GlobalSwitchoff_settings on Settings {
+      globalSwitchoffEnable
+      globalSwitchoffMessage
+    }
+  `,
+})(GlobalSwitchoff);
diff --git a/plugins/talk-plugin-global-switchoff/client/index.js b/plugins/talk-plugin-global-switchoff/client/index.js
index de8b516e7..c9994ce5e 100644
--- a/plugins/talk-plugin-global-switchoff/client/index.js
+++ b/plugins/talk-plugin-global-switchoff/client/index.js
@@ -1,4 +1,4 @@
-import GlobalSwitchoff from './components/GlobalSwitchoff';
+import GlobalSwitchoff from './containers/GlobalSwitchoff';
 import translations from './translations.yml';
 
 export default {