diff --git a/src/main/java/stirling/software/SPDF/config/anonymus/session/AnonymusSessionRegistry.java b/src/main/java/stirling/software/SPDF/config/anonymus/session/AnonymusSessionRegistry.java
index af21da93c..00d6190e2 100644
--- a/src/main/java/stirling/software/SPDF/config/anonymus/session/AnonymusSessionRegistry.java
+++ b/src/main/java/stirling/software/SPDF/config/anonymus/session/AnonymusSessionRegistry.java
@@ -24,7 +24,7 @@ import stirling.software.SPDF.config.interfaces.SessionsModelInterface;
 @Slf4j
 public class AnonymusSessionRegistry implements HttpSessionListener, SessionsInterface {
 
-    @Value("${server.servlet.session.timeout:120s}") // TODO: Change to 30m
+    @Value("${server.servlet.session.timeout:30m}")
     private Duration defaultMaxInactiveInterval;
 
     // Map for storing sessions including timestamp
diff --git a/src/main/java/stirling/software/SPDF/config/anonymus/session/AnonymusSessionService.java b/src/main/java/stirling/software/SPDF/config/anonymus/session/AnonymusSessionService.java
index b0432eeb1..e01a32016 100644
--- a/src/main/java/stirling/software/SPDF/config/anonymus/session/AnonymusSessionService.java
+++ b/src/main/java/stirling/software/SPDF/config/anonymus/session/AnonymusSessionService.java
@@ -18,11 +18,11 @@ public class AnonymusSessionService {
 
     @Autowired private AnonymusSessionRegistry sessionRegistry;
 
-    @Value("${server.servlet.session.timeout:120s}") // TODO: Change to 30m
+    @Value("${server.servlet.session.timeout:30m}")
     private Duration defaultMaxInactiveInterval;
 
     // Runs every minute to expire inactive sessions
-    @Scheduled(cron = "0 0/1 * * * ?")
+    @Scheduled(cron = "0 0/5 * * * ?")
     public void expireSessions() {
         Instant now = Instant.now();
         sessionRegistry.getAllSessions().stream()
diff --git a/src/main/java/stirling/software/SPDF/config/security/session/CustomHttpSessionListener.java b/src/main/java/stirling/software/SPDF/config/security/session/CustomHttpSessionListener.java
index 00183d208..526864d78 100644
--- a/src/main/java/stirling/software/SPDF/config/security/session/CustomHttpSessionListener.java
+++ b/src/main/java/stirling/software/SPDF/config/security/session/CustomHttpSessionListener.java
@@ -36,7 +36,7 @@ public class CustomHttpSessionListener implements HttpSessionListener, SessionsI
     private final boolean loginEnabled;
     private final boolean runningEE;
 
-    @Value("${server.servlet.session.timeout:120s}") // TODO: Change to 30m
+    @Value("${server.servlet.session.timeout:30m}")
     private Duration defaultMaxInactiveInterval;
 
     public CustomHttpSessionListener(
diff --git a/src/main/java/stirling/software/SPDF/config/security/session/SessionPersistentRegistry.java b/src/main/java/stirling/software/SPDF/config/security/session/SessionPersistentRegistry.java
index 40eca54a0..2edeaa0c3 100644
--- a/src/main/java/stirling/software/SPDF/config/security/session/SessionPersistentRegistry.java
+++ b/src/main/java/stirling/software/SPDF/config/security/session/SessionPersistentRegistry.java
@@ -29,7 +29,7 @@ public class SessionPersistentRegistry implements SessionRegistry {
     private final SessionRepository sessionRepository;
     private final boolean runningEE;
 
-    @Value("${server.servlet.session.timeout:120s}") // TODO: Change to 30m
+    @Value("${server.servlet.session.timeout:30m}")
     private Duration defaultMaxInactiveInterval;
 
     public SessionPersistentRegistry(
diff --git a/src/main/java/stirling/software/SPDF/config/security/session/SessionScheduled.java b/src/main/java/stirling/software/SPDF/config/security/session/SessionScheduled.java
index dec1e6680..8f4ede8ae 100644
--- a/src/main/java/stirling/software/SPDF/config/security/session/SessionScheduled.java
+++ b/src/main/java/stirling/software/SPDF/config/security/session/SessionScheduled.java
@@ -28,7 +28,7 @@ public class SessionScheduled {
         this.loginEnabledValue = loginEnabledValue;
     }
 
-    @Scheduled(cron = "0 0/1 * * * ?")
+    @Scheduled(cron = "0 0/5 * * * ?")
     public void expireSessions() {
         Instant now = Instant.now();
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();