diff --git a/src/main/java/org/alfresco/repo/security/authentication/AuthenticationUtil.java b/src/main/java/org/alfresco/repo/security/authentication/AuthenticationUtil.java
index 93972805b9..c740b687b9 100644
--- a/src/main/java/org/alfresco/repo/security/authentication/AuthenticationUtil.java
+++ b/src/main/java/org/alfresco/repo/security/authentication/AuthenticationUtil.java
@@ -618,7 +618,13 @@ public class AuthenticationUtil implements InitializingBean
         {
             if (originalFullAuthentication == null)
             {
-                AuthenticationUtil.clearCurrentSecurityContext();
+                if (logger.isTraceEnabled())
+                {
+                    logger.trace("Removing the current security information for thread: " + Thread.currentThread().getName());
+                }
+                ContextHolder.setContext(null);
+                TenantContextHolder.clearTenantDomain();
+
                 logNDC(null);
             }
             else