diff --git a/src/components/Logout.tsx b/src/components/Logout.tsx
index b0669342..2d033032 100644
--- a/src/components/Logout.tsx
+++ b/src/components/Logout.tsx
@@ -1,15 +1,21 @@
 import * as React from "react";
-import { useEffect } from "react";
+import { useContext, useEffect } from "react";
 import { User } from "@models/userModel";
 import { useLoggedUser } from "@hooks/useLoggedUser";
+import { isUsingOidcAuth } from "@utils/OidcUtils";
+import { AuthContext } from "@oidc/OidcAuthWrapper";
 
 const Logout = () => {
   const [_, setLoggedUser] = useLoggedUser();
-
+  const authCtx = useContext(AuthContext);
   useEffect(() => {
-    setLoggedUser({
-      authenticated: false,
-    } as User);
+    if (isUsingOidcAuth()) {
+      authCtx.logout();
+    } else {
+      setLoggedUser({
+        authenticated: false,
+      } as User);
+    }
   }, []);
 
   return <div>Logging out!</div>;
diff --git a/src/components/routes/AppRoutes.tsx b/src/components/routes/AppRoutes.tsx
index ac949e2e..c0f95689 100644
--- a/src/components/routes/AppRoutes.tsx
+++ b/src/components/routes/AppRoutes.tsx
@@ -98,20 +98,29 @@ const AppRoutes = () => {
   return (
     <LoggedUserProvider>
       <BrowserRouter basename={ENVVariable.BASENAME} /*history={appHistory}*/>
-        <Navigation>
-          <Routes>
-            <Route path={ROUTES.OIDC_SIGNIN_CALLBACK} element={<OidcSignInCallback />} />
-            <Route path={ROUTES.OIDC_SILENT_CALLBACK} element={<OidcSilentCallback />} />
+        <Routes>
+          <Route path={ROUTES.OIDC_SIGNIN_CALLBACK} element={<OidcSignInCallback />} />
+          <Route path={ROUTES.OIDC_SILENT_CALLBACK} element={<OidcSilentCallback />} />
 
-            {routes.map((r) => {
-              if (isUsingOidcAuth()) {
-                return <Route path={r.path} element={<OidcAuthWrapper>{r.element}</OidcAuthWrapper>} />;
-              } else {
-                return <Route key={r.path} path={r.path} element={getElement(r.path, r.element)} />;
-              }
-            })}
-          </Routes>
-        </Navigation>
+          {routes.map((r) => {
+            if (isUsingOidcAuth()) {
+              return (
+                <Route
+                  path={r.path}
+                  element={
+                    <OidcAuthWrapper>
+                      <Navigation>{r.element}</Navigation>
+                    </OidcAuthWrapper>
+                  }
+                />
+              );
+            } else {
+              return (
+                <Route key={r.path} path={r.path} element={<Navigation>{getElement(r.path, r.element)}</Navigation>} />
+              );
+            }
+          })}
+        </Routes>
       </BrowserRouter>
     </LoggedUserProvider>
   );