diff --git a/src/main/app.ts b/src/main/app.ts
index ea5b6209cee..1d8b5cb8d26 100644
--- a/src/main/app.ts
+++ b/src/main/app.ts
@@ -60,7 +60,7 @@ const env = process.env.NODE_ENV || 'development';
 const productionMode = env === 'production';
 const developmentMode = env === 'development';
 const e2eTestMode = env === 'e2eTest';
-const cookieMaxAge = 90 * (60 * 1000); // 21 minutes
+const cookieMaxAge = 21 * (60 * 1000); // 21 minutes
 
 export const app = express();
 app.use(cookieParser());
@@ -94,6 +94,7 @@ app.use(session({
   secret: 'local',
   resave: false,
   saveUninitialized: false,
+  rolling: true, // Refreshes session expiration on each request
   cookie: {
     secure: productionMode,
     maxAge: cookieMaxAge,