diff --git a/frontend/src/LoginPage/LoginPage.jsx b/frontend/src/LoginPage/LoginPage.jsx
index cddf315c99..676c1491ed 100644
--- a/frontend/src/LoginPage/LoginPage.jsx
+++ b/frontend/src/LoginPage/LoginPage.jsx
@@ -52,7 +52,8 @@ class LoginPage extends React.Component {
   authSuccessHandler = () => {
     const params = queryString.parse(this.props.location.search);
     const { from } = params.redirectTo ? { from: { pathname: params.redirectTo } } : { from: { pathname: '/' } };
-    this.props.history.push(from);
+    const redirectPath = from.pathname === '/login' ? '/' : from;
+    this.props.history.push(redirectPath);
     this.setState({ isLoading: false });
   };