diff --git a/client/coral-admin/src/index.js b/client/coral-admin/src/index.js
index 8b90f5acf..f433af4c2 100644
--- a/client/coral-admin/src/index.js
+++ b/client/coral-admin/src/index.js
@@ -9,14 +9,12 @@ import 'react-mdl/extra/material.js';
 import graphqlExtension from './graphql';
 import pluginsConfig from 'pluginsConfig';
 
-const context = createContext({reducers, graphqlExtension, pluginsConfig});
-
 smoothscroll.polyfill();
 
+const context = createContext({reducers, graphqlExtension, pluginsConfig});
+
 render(
-  <TalkProvider
-    {...context}
-  >
+  <TalkProvider {...context}>
     <App />
   </TalkProvider>
   , document.querySelector('#root')
diff --git a/client/coral-embed-stream/src/index.js b/client/coral-embed-stream/src/index.js
index dca4e31b4..5d72ea3e7 100644
--- a/client/coral-embed-stream/src/index.js
+++ b/client/coral-embed-stream/src/index.js
@@ -52,9 +52,7 @@ if (!window.opener) {
 }
 
 render(
-  <TalkProvider
-    {...context}
-  >
+  <TalkProvider {...context}>
     <AppRouter />
   </TalkProvider>
   , document.querySelector('#talk-embed-stream-container')