--- a/client/src/index.js	Tue Oct 09 19:07:47 2018 +0200
+++ b/client/src/index.js	Mon Oct 08 18:35:47 2018 +0200
@@ -2,8 +2,9 @@
 import ReactDOM from 'react-dom';
 import { Provider } from 'react-redux';
 import { Route, Switch } from 'react-router';
-import { ConnectedRouter } from 'react-router-redux';
+import { ConnectedRouter } from 'connected-react-router';
 import createHistory from 'history/createBrowserHistory';
+import { PersistGate } from 'redux-persist/integration/react'
 
 import App from './App';
 import SessionList from './components/SessionList';
@@ -22,22 +23,24 @@
 const history = createHistory({
     basename: config.basename
 });
-const store = configureStore(history);
+const { store, persistor } = configureStore(history);
 
 ReactDOM.render(
   <Provider store={store}>
-    <ConnectedRouter history={history}>
-      <Switch>
-        <Route exact path="/sessions/:id" component={Session} />
-        <Route exact path="/sessions" component={SessionList} />
-        <Route exact path="/register" component={Register} />
-        <Route exact path="/login" component={Login} />
-        <Route exact path="/create-group" component={CreateGroup} />
-        <Route exact path="/read-only/:id" component={ReadOnlySession} />
-        <AuthenticatedRoute exact path="/settings" component={Settings} store={store} />
-        <Route exact path="/" component={App} />
-      </Switch>
-    </ConnectedRouter>
+    <PersistGate loading={null} persistor={persistor} >
+      <ConnectedRouter history={history}>
+        <Switch>
+          <Route exact path="/sessions/:id" component={Session} />
+          <Route exact path="/sessions" component={SessionList} />
+          <Route exact path="/register" component={Register} />
+          <Route exact path="/login" component={Login} />
+          <Route exact path="/create-group" component={CreateGroup} />
+          <Route exact path="/read-only/:id" component={ReadOnlySession} />
+          <AuthenticatedRoute exact path="/settings" component={Settings} store={store} />
+          <Route exact path="/" component={App} />
+        </Switch>
+      </ConnectedRouter>
+    </PersistGate>
   </Provider>,
   document.getElementById('root')
 );