diff --git a/src/App.js b/src/App.js
index 04912e3..b8785e8 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,17 +1,56 @@
 import React from 'react';
 import { Provider } from 'react-redux';
 import { createStore } from 'redux';
-import { PersistGate } from 'redux-persist/integration/react';
+import { AppLoading } from 'expo';
 
 import RootStack from './config/router';
 import configureStore from './redux/configureStore';
 
 const { persistor, store } = configureStore();
 
+class Loader extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      bootstrapped: false,
+    };
+
+    this._loadUserData = this._loadUserData.bind(this);
+    this._unsubscribe = null;
+  }
+
+  componentDidMount() {
+    this._unsubscribe = this.props.persistor.subscribe(this._loadUserData);
+  }
+
+  _loadUserData() {
+    const { persistor } = this.props;
+    let { bootstrapped } = persistor.getState();
+    if (bootstrapped) {
+      this._unsubscribe && this._unsubscribe();
+      return Promise.resolve();
+    }
+  }
+
+  render() {
+    if (!this.state.bootstrapped) {
+      return (
+        <AppLoading
+          startAsync={this._loadUserData}
+          onFinish={() => this.setState({ bootstrapped: true })}
+          onError={console.warn}
+        />
+      );
+    }
+
+    return this.props.children;
+  }
+}
+
 export default (RootApp = () => (
   <Provider store={store}>
-    <PersistGate loading={null} persistor={persistor}>
+    <Loader persistor={persistor}>
       <RootStack />
-    </PersistGate>
+    </Loader>
   </Provider>
 ));