diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/CleanerTimer.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/CleanerTimer.java
index b047cde1209..d3f08c43b32 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/CleanerTimer.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/CleanerTimer.java
@@ -10,6 +10,7 @@
 import com.google.common.collect.Maps;
 import io.jans.as.common.model.common.ArchivedJwk;
 import io.jans.as.common.model.registration.Client;
+import io.jans.as.common.model.session.DeviceSession;
 import io.jans.as.common.model.session.SessionId;
 import io.jans.as.model.config.StaticConfiguration;
 import io.jans.as.model.configuration.AppConfiguration;
@@ -36,7 +37,6 @@
 import jakarta.enterprise.event.Event;
 import jakarta.enterprise.event.Observes;
 import jakarta.inject.Inject;
-import jakarta.inject.Named;
 import org.apache.tika.utils.StringUtils;
 import org.slf4j.Logger;
 
@@ -217,6 +217,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(), DeviceSession.class);
         cleanServiceBaseDns.put(staticConfiguration.getBaseDn().getPar(), Par.class);
         cleanServiceBaseDns.put(staticConfiguration.getBaseDn().getArchivedJwks(), ArchivedJwk.class);