diff --git a/packages/components-faraday/src/components/Admin/AdminRoute.js b/packages/components-faraday/src/components/Admin/AdminRoute.js
index 919265c5abc488311fa0805adad2ab9e1901e7c3..eec0488276fb6d1066a0602920715bc6f19aab81 100644
--- a/packages/components-faraday/src/components/Admin/AdminRoute.js
+++ b/packages/components-faraday/src/components/Admin/AdminRoute.js
@@ -15,13 +15,11 @@ const PrivateRoute = ({
   <Route
     {...rest}
     render={props => {
-      if (!currentUser.isFetched) {
-        if (!currentUser.isFetching) {
-          getCurrentUser()
-        }
-
+      if (!currentUser.user && !currentUser.isFetching) {
+        getCurrentUser()
         return <div>loading…</div>
       }
+
       if (!get(currentUser, 'user.admin') || !currentUser.isAuthenticated) {
         return (
           <Redirect