diff --git a/Server/src/main/java/org/gluu/oxauth/service/CleanerTimer.java b/Server/src/main/java/org/gluu/oxauth/service/CleanerTimer.java
index d2322d92b..5d228384b 100644
--- a/Server/src/main/java/org/gluu/oxauth/service/CleanerTimer.java
+++ b/Server/src/main/java/org/gluu/oxauth/service/CleanerTimer.java
@@ -6,19 +6,8 @@
 
 package org.gluu.oxauth.service;
 
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Event;
-import javax.enterprise.event.Observes;
-import javax.inject.Inject;
-import javax.inject.Named;
-
+import com.google.common.base.Stopwatch;
+import com.google.common.collect.Maps;
 import org.gluu.model.ApplicationType;
 import org.gluu.model.metric.ldap.MetricEntry;
 import org.gluu.oxauth.model.config.StaticConfiguration;
@@ -28,6 +17,7 @@
 import org.gluu.oxauth.model.ldap.ClientAuthorization;
 import org.gluu.oxauth.model.ldap.TokenLdap;
 import org.gluu.oxauth.model.registration.Client;
+import org.gluu.oxauth.model.session.AuthorizationChallengeSession;
 import org.gluu.oxauth.model.session.SessionId;
 import org.gluu.oxauth.model.uma.persistence.UmaResource;
 import org.gluu.oxauth.service.fido.u2f.RequestService;
@@ -45,8 +35,17 @@
 import org.oxauth.persistence.model.Scope;
 import org.slf4j.Logger;
 
-import com.google.common.base.Stopwatch;
-import com.google.common.collect.Maps;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.event.Event;
+import javax.enterprise.event.Observes;
+import javax.inject.Inject;
+import javax.inject.Named;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * @author Yuriy Zabrovarnyy
@@ -200,6 +199,7 @@ private Map<String, Class<?>> createCleanServiceBaseDns() {
         cleanServiceBaseDns.put(staticConfiguration.getBaseDn().getAuthorizations(), ClientAuthorization.class);
         cleanServiceBaseDns.put(staticConfiguration.getBaseDn().getScopes(), Scope.class);
         cleanServiceBaseDns.put(staticConfiguration.getBaseDn().getSessions(), SessionId.class);
+        cleanServiceBaseDns.put(staticConfiguration.getBaseDn().getSessions(), AuthorizationChallengeSession.class);
 
         return cleanServiceBaseDns;
     }