diff --git a/ui/src/index.js b/ui/src/index.js
index 3370a1ce5f..bd5160a30d 100644
--- a/ui/src/index.js
+++ b/ui/src/index.js
@@ -74,12 +74,19 @@ window.addEventListener('keyup', event => {
 const history = syncHistoryWithStore(browserHistory, store)
 
 const Root = React.createClass({
+  getInitialState() {
+    return {
+      ready: false,
+    }
+  },
+
   async componentWillMount() {
     this.flushErrorsQueue()
 
     try {
       await this.getLinks()
-      this.checkAuth()
+      await this.checkAuth()
+      this.setState({ready: true})
     } catch (error) {
       dispatch(errorThrown(error))
     }
@@ -115,48 +122,66 @@ const Root = React.createClass({
   },
 
   render() {
-    return (
-      <Provider store={store}>
-        <Router history={history}>
-          <Route path="/" component={UserIsAuthenticated(CheckSources)} />
-          <Route path="/login" component={UserIsNotAuthenticated(Login)} />
-          <Route path="/purgatory" component={UserIsAuthenticated(Purgatory)} />
-          <Route
-            path="/sources/new"
-            component={UserIsAuthenticated(SourcePage)}
-          />
-          <Route path="/sources/:sourceID" component={UserIsAuthenticated(App)}>
-            <Route component={CheckSources}>
-              <Route path="status" component={StatusPage} />
-              <Route path="hosts" component={HostsPage} />
-              <Route path="hosts/:hostID" component={HostPage} />
-              <Route path="chronograf/data-explorer" component={DataExplorer} />
-              <Route path="dashboards" component={DashboardsPage} />
-              <Route path="dashboards/:dashboardID" component={DashboardPage} />
-              <Route path="alerts" component={AlertsApp} />
-              <Route path="alert-rules" component={KapacitorRulesPage} />
-              <Route path="alert-rules/:ruleID" component={KapacitorRulePage} />
-              <Route path="alert-rules/new" component={KapacitorRulePage} />
-              <Route path="tickscript/new" component={TickscriptPage} />
-              <Route path="tickscript/:ruleID" component={TickscriptPage} />
-              <Route path="kapacitors/new" component={KapacitorPage} />
-              <Route path="kapacitors/:id/edit" component={KapacitorPage} />
-              <Route
-                path="kapacitors/:id/edit:hash"
-                component={KapacitorPage}
-              />
-              <Route path="kapacitor-tasks" component={KapacitorTasksPage} />
-              <Route path="admin-chronograf" component={AdminChronografPage} />
-              <Route path="admin-influxdb" component={AdminInfluxDBPage} />
-              <Route path="manage-sources" component={ManageSources} />
-              <Route path="manage-sources/new" component={SourcePage} />
-              <Route path="manage-sources/:id/edit" component={SourcePage} />
+    return !this.state.ready // eslint-disable-line no-negated-condition
+      ? <div className="page-spinner" />
+      : <Provider store={store}>
+          <Router history={history}>
+            <Route path="/" component={UserIsAuthenticated(CheckSources)} />
+            <Route path="/login" component={UserIsNotAuthenticated(Login)} />
+            <Route
+              path="/purgatory"
+              component={UserIsAuthenticated(Purgatory)}
+            />
+            <Route
+              path="/sources/new"
+              component={UserIsAuthenticated(SourcePage)}
+            />
+            <Route
+              path="/sources/:sourceID"
+              component={UserIsAuthenticated(App)}
+            >
+              <Route component={CheckSources}>
+                <Route path="status" component={StatusPage} />
+                <Route path="hosts" component={HostsPage} />
+                <Route path="hosts/:hostID" component={HostPage} />
+                <Route
+                  path="chronograf/data-explorer"
+                  component={DataExplorer}
+                />
+                <Route path="dashboards" component={DashboardsPage} />
+                <Route
+                  path="dashboards/:dashboardID"
+                  component={DashboardPage}
+                />
+                <Route path="alerts" component={AlertsApp} />
+                <Route path="alert-rules" component={KapacitorRulesPage} />
+                <Route
+                  path="alert-rules/:ruleID"
+                  component={KapacitorRulePage}
+                />
+                <Route path="alert-rules/new" component={KapacitorRulePage} />
+                <Route path="tickscript/new" component={TickscriptPage} />
+                <Route path="tickscript/:ruleID" component={TickscriptPage} />
+                <Route path="kapacitors/new" component={KapacitorPage} />
+                <Route path="kapacitors/:id/edit" component={KapacitorPage} />
+                <Route
+                  path="kapacitors/:id/edit:hash"
+                  component={KapacitorPage}
+                />
+                <Route path="kapacitor-tasks" component={KapacitorTasksPage} />
+                <Route
+                  path="admin-chronograf"
+                  component={AdminChronografPage}
+                />
+                <Route path="admin-influxdb" component={AdminInfluxDBPage} />
+                <Route path="manage-sources" component={ManageSources} />
+                <Route path="manage-sources/new" component={SourcePage} />
+                <Route path="manage-sources/:id/edit" component={SourcePage} />
+              </Route>
             </Route>
-          </Route>
-          <Route path="*" component={NotFound} />
-        </Router>
-      </Provider>
-    )
+            <Route path="*" component={NotFound} />
+          </Router>
+        </Provider>
   },
 })