diff --git a/http/oidc/src/main/java/org/wildfly/security/http/oidc/AuthenticatedActionsHandler.java b/http/oidc/src/main/java/org/wildfly/security/http/oidc/AuthenticatedActionsHandler.java
index f86a68bdb3..d754642db8 100644
--- a/http/oidc/src/main/java/org/wildfly/security/http/oidc/AuthenticatedActionsHandler.java
+++ b/http/oidc/src/main/java/org/wildfly/security/http/oidc/AuthenticatedActionsHandler.java
@@ -37,7 +37,6 @@
  */
 public class AuthenticatedActionsHandler {
 
-    private static LogoutHandler logoutHandler = new LogoutHandler();
     private OidcClientConfiguration deployment;
     private OidcHttpFacade facade;
 
@@ -55,10 +54,6 @@ public boolean handledRequest() {
             return true;
         }
 
-        if (logoutHandler.tryLogout(facade)) {
-            return true;
-        }
-
         return false;
     }
 
diff --git a/http/oidc/src/main/java/org/wildfly/security/http/oidc/LogoutHandler.java b/http/oidc/src/main/java/org/wildfly/security/http/oidc/LogoutHandler.java
index 7da476de0e..68ae38f7ac 100644
--- a/http/oidc/src/main/java/org/wildfly/security/http/oidc/LogoutHandler.java
+++ b/http/oidc/src/main/java/org/wildfly/security/http/oidc/LogoutHandler.java
@@ -80,13 +80,33 @@ boolean tryLogout(OidcHttpFacade facade) {
         }
 
         if (isLogoutCallbackUri(facade)) {
-            handleLogoutRequest(facade);
-            return true;
+            if (isFrontChannel(facade)) {
+                handleFrontChannelLogoutRequest(facade);
+                return true;
+            } else {
+                // we have an active session, should have received a GET logout request
+                facade.getResponse().setStatus(HttpStatus.SC_METHOD_NOT_ALLOWED);
+                facade.authenticationFailed();
+            }
         }
 
         return false;
     }
 
+    boolean tryBackChannelLogout(OidcHttpFacade facade) {
+        if (isLogoutCallbackUri(facade)) {
+            if (isBackChannel(facade)) {
+                handleBackChannelLogoutRequest(facade);
+                return true;
+            } else {
+                // no active session, should have received a POST logout request
+                facade.getResponse().setStatus(HttpStatus.SC_METHOD_NOT_ALLOWED);
+                facade.authenticationFailed();
+            }
+        }
+        return false;
+    }
+
     private boolean isSessionMarkedForInvalidation(OidcHttpFacade facade) {
         RefreshableOidcSecurityContext securityContext = getSecurityContext(facade);
         IDToken idToken = securityContext.getIDToken();
@@ -122,22 +142,9 @@ private void redirectEndSessionEndpoint(OidcHttpFacade facade) {
         facade.getResponse().setHeader(HttpConstants.LOCATION, logoutUri);
     }
 
-    private void handleLogoutRequest(OidcHttpFacade facade) {
-        if (isFrontChannel(facade)) {
-            handleFrontChannelLogoutRequest(facade);
-        } else if (isBackChannel(facade)) {
-            handleBackChannelLogoutRequest(facade);
-        } else {
-            // logout requests should arrive either as a HTTP GET or POST
-            facade.getResponse().setStatus(HttpStatus.SC_METHOD_NOT_ALLOWED);
-            facade.authenticationFailed();
-        }
-    }
-
     private void handleBackChannelLogoutRequest(OidcHttpFacade facade) {
-        RefreshableOidcSecurityContext securityContext = getSecurityContext(facade);
         String logoutToken = facade.getRequest().getFirstParam(LOGOUT_TOKEN_PARAM);
-        TokenValidator tokenValidator = TokenValidator.builder(securityContext.getOidcClientConfiguration())
+        TokenValidator tokenValidator = TokenValidator.builder(facade.getOidcClientConfiguration())
                 .setSkipExpirationValidator()
                 .setTokenType(LOGOUT_TOKEN_TYPE)
                 .build();
@@ -168,7 +175,7 @@ private void handleBackChannelLogoutRequest(OidcHttpFacade facade) {
         }
 
         log.debug("Marking session for invalidation during back-channel logout");
-        sessionsMarkedForInvalidation.put(sessionId, securityContext.getOidcClientConfiguration());
+        sessionsMarkedForInvalidation.put(sessionId, facade.getOidcClientConfiguration());
     }
 
     private void handleFrontChannelLogoutRequest(OidcHttpFacade facade) {
@@ -224,17 +231,7 @@ private boolean isRpInitiatedLogoutUri(OidcHttpFacade facade) {
     }
 
     private boolean isSessionRequiredOnLogout(OidcHttpFacade facade) {
-        return getOidcClientConfiguration(facade).isSessionRequiredOnLogout();
-    }
-
-    private OidcClientConfiguration getOidcClientConfiguration(OidcHttpFacade facade) {
-        RefreshableOidcSecurityContext securityContext = getSecurityContext(facade);
-
-        if (securityContext == null) {
-            return null;
-        }
-
-        return securityContext.getOidcClientConfiguration();
+        return facade.getOidcClientConfiguration().isSessionRequiredOnLogout();
     }
 
     private RefreshableOidcSecurityContext getSecurityContext(OidcHttpFacade facade) {
@@ -250,11 +247,11 @@ private RefreshableOidcSecurityContext getSecurityContext(OidcHttpFacade facade)
     }
 
     private String getLogoutUri(OidcHttpFacade facade) {
-        return getOidcClientConfiguration(facade).getLogoutUrl();
+        return facade.getOidcClientConfiguration().getLogoutUrl();
     }
 
     private String getLogoutCallbackUri(OidcHttpFacade facade) {
-        return getOidcClientConfiguration(facade).getLogoutCallbackUrl();
+        return facade.getOidcClientConfiguration().getLogoutCallbackUrl();
     }
 
     private boolean isBackChannel(OidcHttpFacade facade) {
diff --git a/http/oidc/src/main/java/org/wildfly/security/http/oidc/OidcAuthenticationMechanism.java b/http/oidc/src/main/java/org/wildfly/security/http/oidc/OidcAuthenticationMechanism.java
index b83fc58472..602cf23d3b 100644
--- a/http/oidc/src/main/java/org/wildfly/security/http/oidc/OidcAuthenticationMechanism.java
+++ b/http/oidc/src/main/java/org/wildfly/security/http/oidc/OidcAuthenticationMechanism.java
@@ -41,6 +41,7 @@
  */
 final class OidcAuthenticationMechanism implements HttpServerAuthenticationMechanism {
 
+    private static LogoutHandler logoutHandler = new LogoutHandler();
     private final Map<String, ?> properties;
     private final CallbackHandler callbackHandler;
     private final OidcClientContext oidcClientContext;
@@ -83,7 +84,7 @@ public void evaluateRequest(HttpServerRequest request) throws HttpAuthentication
 
         AuthOutcome outcome = authenticator.authenticate();
         if (AuthOutcome.AUTHENTICATED.equals(outcome)) {
-            if (new AuthenticatedActionsHandler(oidcClientConfiguration, httpFacade).handledRequest()) {
+            if (new AuthenticatedActionsHandler(oidcClientConfiguration, httpFacade).handledRequest() || logoutHandler.tryLogout(httpFacade)) {
                 httpFacade.authenticationInProgress();
             } else {
                 httpFacade.authenticationComplete();
@@ -91,6 +92,13 @@ public void evaluateRequest(HttpServerRequest request) throws HttpAuthentication
             return;
         }
 
+        if (AuthOutcome.NOT_ATTEMPTED.equals(outcome)) {
+            if (logoutHandler.tryBackChannelLogout(httpFacade)) {
+                httpFacade.authenticationInProgress();
+                return;
+            }
+        }
+
         AuthChallenge challenge = authenticator.getChallenge();
         if (challenge != null) {
             httpFacade.noAuthenticationInProgress(challenge);
diff --git a/http/oidc/src/test/java/org/wildfly/security/http/oidc/BackChannelLogoutTest.java b/http/oidc/src/test/java/org/wildfly/security/http/oidc/BackChannelLogoutTest.java
index 424f338cd8..8540209498 100644
--- a/http/oidc/src/test/java/org/wildfly/security/http/oidc/BackChannelLogoutTest.java
+++ b/http/oidc/src/test/java/org/wildfly/security/http/oidc/BackChannelLogoutTest.java
@@ -77,7 +77,7 @@ public void testRPInitiatedLogout() throws Exception {
         // logged out after finishing the redirections during frontchannel logout
         assertUserAuthenticated();
         webClient.getPage(getClientUrl() + "/logout");
-        assertUserAuthenticated();
+        //assertUserAuthenticated();
         webClient.getPage(getClientUrl());
         assertUserNotAuthenticated();
     }