diff --git a/awx/ui/src/App.js b/awx/ui/src/App.js
index 77116d3f8b..06c7085c12 100644
--- a/awx/ui/src/App.js
+++ b/awx/ui/src/App.js
@@ -102,6 +102,10 @@ const ProtectedRoute = ({ children, ...rest }) => {
   const { authRedirectTo, setAuthRedirectTo } = useSession();
   const { pathname } = useLocation();
 
+  useEffect(() => {
+    setAuthRedirectTo(authRedirectTo === '/logout' ? '/' : pathname);
+  });
+
   if (isAuthenticated(document.cookie)) {
     return (
       <Route {...rest}>
@@ -112,8 +116,6 @@ const ProtectedRoute = ({ children, ...rest }) => {
     );
   }
 
-  setAuthRedirectTo(authRedirectTo === '/logout' ? '/' : pathname);
-
   return <Redirect to="/login" />;
 };