diff --git a/src/RootWithIntl.js b/src/RootWithIntl.js
index 2b0be727f..1dcf29c63 100644
--- a/src/RootWithIntl.js
+++ b/src/RootWithIntl.js
@@ -28,7 +28,6 @@ import {
   HandlerManager,
   TitleManager,
   Logout,
-  LogoutTimeout,
   OverlayContainer,
   CreateResetPassword,
   CheckEmailStatusPage,
@@ -99,7 +98,7 @@ const RootWithIntl = ({ stripes, token = '', isAuthenticated = false, disableAut
                                 <TitledRoute
                                   name="logoutTimeout"
                                   path="/logout-timeout"
-                                  component={<LogoutTimeout />}
+                                  component={<Logout />}
                                 />
                                 <TitledRoute
                                   name="settings"
@@ -109,7 +108,7 @@ const RootWithIntl = ({ stripes, token = '', isAuthenticated = false, disableAut
                                 <TitledRoute
                                   name="logout"
                                   path="/logout"
-                                  component={<Logout history={history} />}
+                                  component={<Logout />}
                                 />
                                 <ModuleRoutes stripes={connectedStripes} />
                               </Switch>
@@ -156,10 +155,15 @@ const RootWithIntl = ({ stripes, token = '', isAuthenticated = false, disableAut
                         path="/check-email"
                         component={<CheckEmailStatusPage />}
                       />
+                      <TitledRoute
+                        name="logout"
+                        path="/logout"
+                        component={<Logout />}
+                      />
                       <TitledRoute
                         name="logoutTimeout"
                         path="/logout-timeout"
-                        component={<LogoutTimeout />}
+                        component={<Logout />}
                       />
                       <TitledRoute
                         name="login"
diff --git a/src/components/LogoutTimeout/LogoutTimeout.css b/src/components/Logout/Logout.css
similarity index 100%
rename from src/components/LogoutTimeout/LogoutTimeout.css
rename to src/components/Logout/Logout.css
diff --git a/src/components/Logout/Logout.js b/src/components/Logout/Logout.js
index 3d582c732..e99e0cae9 100644
--- a/src/components/Logout/Logout.js
+++ b/src/components/Logout/Logout.js
@@ -1,36 +1,83 @@
 import { useEffect, useState } from 'react';
-import { Redirect } from 'react-router';
+import { useLocation } from 'react-router';
 import { FormattedMessage } from 'react-intl';
+import { branding } from 'stripes-config';
 
+import {
+  Button,
+  Col,
+  Headline,
+  LoadingView,
+  Row,
+} from '@folio/stripes-components';
+
+import OrganizationLogo from '../OrganizationLogo';
 import { useStripes } from '../../StripesContext';
-import { getLocale, logout } from '../../loginServices';
+import { logout } from '../../loginServices';
+
+import styles from './Logout.css';
 
 /**
  * Logout
- * Call logout, then redirect to root.
+ * Make an API call to /logout to terminate the session server-side and render
+ * a "you've logged out" message. This component can be invoked from different
+ * UI routes and will display a different message depending on that route:
  *
- * This corresponds to the '/logout' route, allowing that route to be directly
- * accessible rather than only accessible through the menu action.
+ * /logout: a user chose to end the session
+ * /logout-timeout: stripes redirects to this location due to idle-session timeout
  *
  */
 const Logout = () => {
   const stripes = useStripes();
   const [didLogout, setDidLogout] = useState(false);
+  const location = useLocation();
+
+  const messageId = location.pathName === '/logout-timeout' ? 'stripes-core.rtr.idleSession.sessionExpiredSoSad' : 'stripes-core.logoutComplete';
 
   useEffect(
     () => {
-      getLocale(stripes.okapi.url, stripes.store, stripes.okapi.tenant)
-        .then(logout(stripes.okapi.url, stripes.store))
-        .then(setDidLogout(true));
+      if (stripes.okapi.isAuthenticated) {
+        // returns a promise, which we ignore
+        logout(stripes.okapi.url, stripes.store)
+          .then(setDidLogout(true));
+      } else {
+        setDidLogout(true);
+      }
     },
     // no dependencies because we only want to start the logout process once.
-    // we don't care about changes to history or stripes; certainly those
-    // could be updated as part of the logout process
+    // we don't care about changes to stripes; certainly it'll be updated as
+    // part of the logout process
     // eslint-disable-next-line react-hooks/exhaustive-deps
     []
   );
 
-  return didLogout ? <Redirect to="/" /> : <FormattedMessage id="stripes-core.logoutPending" />;
+  if (!didLogout) {
+    return <LoadingView />;
+  }
+
+  return (
+    <main>
+      <div className={styles.wrapper} style={branding.style?.login ?? {}}>
+        <div className={styles.container}>
+          <Row center="xs">
+            <Col xs={12}>
+              <OrganizationLogo />
+            </Col>
+          </Row>
+          <Row center="xs">
+            <Col xs={12}>
+              <Headline size="large"><FormattedMessage id={messageId} /></Headline>
+            </Col>
+          </Row>
+          <Row center="xs">
+            <Col xs={12}>
+              <Button to="/"><FormattedMessage id="stripes-core.rtr.idleSession.logInAgain" /></Button>
+            </Col>
+          </Row>
+        </div>
+      </div>
+    </main>
+  );
 };
 
 export default Logout;
diff --git a/src/components/Logout/Logout.test.js b/src/components/Logout/Logout.test.js
index 383c89d0e..aa950b0da 100644
--- a/src/components/Logout/Logout.test.js
+++ b/src/components/Logout/Logout.test.js
@@ -1,46 +1,64 @@
-import { render, screen, waitFor } from '@folio/jest-config-stripes/testing-library/react';
+import { render, screen } from '@folio/jest-config-stripes/testing-library/react';
+import { useLocation } from 'react-router';
 
-import Harness from '../../../test/jest/helpers/harness';
 import Logout from './Logout';
+import { useStripes } from '../../StripesContext';
 import { logout } from '../../loginServices';
 
+jest.mock('../OrganizationLogo');
+jest.mock('../../StripesContext');
+jest.mock('react-router');
+
 jest.mock('../../loginServices', () => ({
-  ...(jest.requireActual('../../loginServices')),
-  getLocale: () => Promise.resolve(),
-  logout: jest.fn()
+  logout: jest.fn(() => Promise.resolve()),
 }));
 
-jest.mock('react-router', () => ({
-  ...(jest.requireActual('react-router')),
-  Redirect: () => <div>Redirect</div>
-}));
+describe('Logout', () => {
+  describe('Direct logout', () => {
+    beforeEach(() => {
+      const mockUseLocation = useLocation;
+      mockUseLocation.mockReturnValue({ pathName: '/logout' });
+    });
 
-const stripes = {
-  config: {
-    rtr: {
-      idleModalTTL: '3s',
-      idleSessionTTL: '3s',
-    }
-  },
-  okapi: {
-    url: 'https://blah',
-  },
-  logger: { log: jest.fn() },
-  store: {
-    getState: jest.fn(),
-  },
-};
+    it('if not authenticated, renders a logout message', async () => {
+      const mockUseStripes = useStripes;
+      mockUseStripes.mockReturnValue({ okapi: { isAuthenticated: false } });
 
-describe('Logout', () => {
-  it('calls logout and redirects', async () => {
-    logout.mockReturnValue(Promise.resolve());
+      render(<Logout />);
+      screen.getByText('stripes-core.logoutComplete');
+    });
+
+    it('if authenticated, calls logout then renders a logout message', async () => {
+      const mockUseStripes = useStripes;
+      mockUseStripes.mockReturnValue({ okapi: { isAuthenticated: true } });
 
-    render(<Harness stripes={stripes}><Logout /></Harness>);
+      render(<Logout />);
+      expect(logout).toHaveBeenCalled();
+      screen.getByText('stripes-core.logoutComplete');
+    });
+  });
 
-    await waitFor(() => {
-      screen.getByText('Redirect');
+  describe('Timeout logout', () => {
+    beforeEach(() => {
+      const mockUseLocation = useLocation;
+      mockUseLocation.mockReturnValue({ pathName: '/logout-timeout' });
     });
 
-    expect(logout).toHaveBeenCalledTimes(1);
+    it('if not authenticated, renders a timeout message', async () => {
+      const mockUseStripes = useStripes;
+      mockUseStripes.mockReturnValue({ okapi: { isAuthenticated: false } });
+
+      render(<Logout />);
+      screen.getByText('stripes-core.rtr.idleSession.sessionExpiredSoSad');
+    });
+
+    it('if authenticated, calls logout then renders a timeout message', async () => {
+      const mockUseStripes = useStripes;
+      mockUseStripes.mockReturnValue({ okapi: { isAuthenticated: true } });
+
+      render(<Logout />);
+      expect(logout).toHaveBeenCalled();
+      screen.getByText('stripes-core.rtr.idleSession.sessionExpiredSoSad');
+    });
   });
 });
diff --git a/src/components/LogoutTimeout/LogoutTimeout.js b/src/components/LogoutTimeout/LogoutTimeout.js
deleted file mode 100644
index 557a32c05..000000000
--- a/src/components/LogoutTimeout/LogoutTimeout.js
+++ /dev/null
@@ -1,90 +0,0 @@
-import { useEffect, useState } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { branding } from 'stripes-config';
-
-import {
-  Button,
-  Col,
-  Headline,
-  LoadingView,
-  Row,
-} from '@folio/stripes-components';
-
-import OrganizationLogo from '../OrganizationLogo';
-import { useStripes } from '../../StripesContext';
-import {
-  getUnauthorizedPathFromSession,
-  logout,
-  removeUnauthorizedPathFromSession,
-} from '../../loginServices';
-
-import styles from './LogoutTimeout.css';
-
-/**
- * LogoutTimeout
- * Show a "sorry, your session timed out message"; if the session is still
- * active, call logout() to end it.
- *
- * Having a static route to this page allows the logout handler to choose
- * between redirecting straight to the login page (if the user chose to
- * logout) or to this page (if the session timed out).
- *
- * This corresponds to the '/logout-timeout' route.
- */
-const LogoutTimeout = () => {
-  const stripes = useStripes();
-  const [didLogout, setDidLogout] = useState(false);
-
-  useEffect(
-    () => {
-      if (stripes.okapi.isAuthenticated) {
-        // returns a promise, which we ignore
-        logout(stripes.okapi.url, stripes.store)
-          .then(setDidLogout(true));
-      } else {
-        setDidLogout(true);
-      }
-    },
-    // no dependencies because we only want to start the logout process once.
-    // we don't care about changes to stripes; certainly it'll be updated as
-    // part of the logout process
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    []
-  );
-
-  const handleClick = (_e) => {
-    removeUnauthorizedPathFromSession();
-  };
-
-  const redirectTo = getUnauthorizedPathFromSession() || '/';
-
-  if (!didLogout) {
-    return <LoadingView />;
-  }
-
-  return (
-    <main>
-      <div className={styles.wrapper} style={branding.style?.login ?? {}}>
-        <div className={styles.container}>
-          <Row center="xs">
-            <Col xs={12}>
-              <OrganizationLogo />
-            </Col>
-          </Row>
-          <Row center="xs">
-            <Col xs={12}>
-              <Headline size="large"><FormattedMessage id="stripes-core.rtr.idleSession.sessionExpiredSoSad" /></Headline>
-            </Col>
-          </Row>
-          <Row center="xs">
-            <Col xs={12}>
-              <Button to={redirectTo} onClick={handleClick}><FormattedMessage id="stripes-core.rtr.idleSession.logInAgain" /></Button>
-            </Col>
-          </Row>
-        </div>
-      </div>
-    </main>
-  );
-};
-
-export default LogoutTimeout;
diff --git a/src/components/LogoutTimeout/LogoutTimeout.test.js b/src/components/LogoutTimeout/LogoutTimeout.test.js
deleted file mode 100644
index cb8606eac..000000000
--- a/src/components/LogoutTimeout/LogoutTimeout.test.js
+++ /dev/null
@@ -1,71 +0,0 @@
-import { render, screen } from '@folio/jest-config-stripes/testing-library/react';
-import { userEvent } from '@folio/jest-config-stripes/testing-library/user-event';
-
-import LogoutTimeout from './LogoutTimeout';
-import { useStripes } from '../../StripesContext';
-import { getUnauthorizedPathFromSession, logout, setUnauthorizedPathToSession } from '../../loginServices';
-
-jest.mock('../OrganizationLogo');
-jest.mock('../../StripesContext');
-jest.mock('react-router', () => ({
-  Redirect: () => <div>Redirect</div>,
-}));
-
-jest.mock('../../loginServices', () => ({
-  logout: jest.fn(() => Promise.resolve()),
-  getUnauthorizedPathFromSession: jest.fn(),
-  removeUnauthorizedPathFromSession: jest.fn(),
-  setUnauthorizedPathToSession: jest.fn(),
-}));
-
-describe('LogoutTimeout', () => {
-  describe('if not authenticated', () => {
-    it('renders a timeout message', async () => {
-      const mockUseStripes = useStripes;
-      mockUseStripes.mockReturnValue({ okapi: { isAuthenticated: false } });
-
-      render(<LogoutTimeout />);
-      screen.getByText('stripes-core.rtr.idleSession.sessionExpiredSoSad');
-    });
-
-    it('clears previous path from storage after clicking "log in again"', async () => {
-      const previousPath = '/monkey?bagel';
-      setUnauthorizedPathToSession(previousPath);
-      const user = userEvent.setup();
-      const mockUseStripes = useStripes;
-      mockUseStripes.mockReturnValue({ okapi: { isAuthenticated: false } });
-
-      render(<LogoutTimeout />);
-
-      await user.click(screen.getByRole('button'));
-      expect(getUnauthorizedPathFromSession()).toBeFalsy();
-    });
-  });
-
-  describe('if not authenticated', () => {
-    it('calls logout then renders a timeout message', async () => {
-      const mockUseStripes = useStripes;
-      mockUseStripes.mockReturnValue({ okapi: { isAuthenticated: true } });
-
-      render(<LogoutTimeout />);
-      expect(logout).toHaveBeenCalled();
-      screen.getByText('stripes-core.rtr.idleSession.sessionExpiredSoSad');
-    });
-
-    it('clears previous path from storage after clicking "log in again"', async () => {
-      const previousPath = '/monkey?bagel';
-      setUnauthorizedPathToSession(previousPath);
-      const user = userEvent.setup();
-      const mockUseStripes = useStripes;
-      mockUseStripes.mockReturnValue({ okapi: { isAuthenticated: true } });
-
-      render(<LogoutTimeout />);
-
-      expect(logout).toHaveBeenCalled();
-      screen.getByText('stripes-core.rtr.idleSession.sessionExpiredSoSad');
-
-      await user.click(screen.getByRole('button'));
-      expect(getUnauthorizedPathFromSession()).toBeFalsy();
-    });
-  });
-});
diff --git a/src/components/LogoutTimeout/index.js b/src/components/LogoutTimeout/index.js
deleted file mode 100644
index a355b4149..000000000
--- a/src/components/LogoutTimeout/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './LogoutTimeout';
diff --git a/src/components/index.js b/src/components/index.js
index fa72c92b4..015f3867a 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -6,7 +6,6 @@ export { default as AppCtxMenuProvider } from './MainNav/CurrentApp/AppCtxMenuPr
 export { LastVisitedContext, withLastVisited } from './LastVisited';
 export { default as Login } from './Login';
 export { default as Logout } from './Logout';
-export { default as LogoutTimeout } from './LogoutTimeout';
 export { default as MainContainer } from './MainContainer';
 export { default as MainNav } from './MainNav';
 export { default as ModuleContainer } from './ModuleContainer';
diff --git a/test/bigtest/tests/profile-dropdown-test.js b/test/bigtest/tests/profile-dropdown-test.js
index a0a3f475a..affd2b8ca 100644
--- a/test/bigtest/tests/profile-dropdown-test.js
+++ b/test/bigtest/tests/profile-dropdown-test.js
@@ -1,7 +1,7 @@
 import { describe, beforeEach, it } from 'mocha';
 import { expect } from 'chai';
 import React, { Component } from 'react';
-import { Dropdown as DropdownInteractor, HTML, TextField as LoginInteractor } from '@folio/stripes-testing';
+import { Dropdown as DropdownInteractor, HTML } from '@folio/stripes-testing';
 import setupApplication from '../helpers/setup-application';
 
 class DummyApp extends Component {
@@ -19,7 +19,6 @@ const ProfileMenuInteractor = HTML.extend('profile menu')
 describe('Profile dropdown', () => {
   const profileDropdown = DropdownInteractor({ id: 'profileDropdown' });
   const profileMenu = ProfileMenuInteractor();
-  const loginInteractor = LoginInteractor({ id: 'input-username' });
 
   const modules = [{
     type: 'app',
@@ -104,7 +103,9 @@ describe('Profile dropdown', () => {
         await profileMenu.find(HTML('Log out')).click();
       });
 
-      it('changes the url', () => loginInteractor.exists());
+      it('changes the url', function () {
+        expect(this.location.pathname).to.equal('/logout');
+      });
     });
   });
 });
diff --git a/translations/stripes-core/en.json b/translations/stripes-core/en.json
index 8ccf97c25..c0c98413a 100644
--- a/translations/stripes-core/en.json
+++ b/translations/stripes-core/en.json
@@ -90,6 +90,7 @@
   "logout": "Log out",
   "logoutPending": "Log out in process...",
   "logoutKeepSso": "Log out from FOLIO, keep SSO session",
+  "logoutComplete": "You have logged out.",
   "login": "Log in",
   "username": "Username",
   "password": "Password",
diff --git a/translations/stripes-core/en_US.json b/translations/stripes-core/en_US.json
index 1bfbcd716..e6225264e 100644
--- a/translations/stripes-core/en_US.json
+++ b/translations/stripes-core/en_US.json
@@ -158,5 +158,6 @@
     "tenantChoose": "Select your tenant/library",
     "tenantLibrary": "Tenant/Library",
     "errors.saml.missingToken": "No <code>code</code> query parameter.",
-    "rtr.fixedLengthSession.timeRemaining": "Your session will end soon! Time remaining:"
-}
\ No newline at end of file
+    "rtr.fixedLengthSession.timeRemaining": "Your session will end soon! Time remaining:",
+    "logoutComplete": "You have logged out."
+}