diff --git a/components/app/R/global.R b/components/app/R/global.R
index e410da07c..7bd39463f 100644
--- a/components/app/R/global.R
+++ b/components/app/R/global.R
@@ -168,6 +168,7 @@ opt.default <- list(
   ENABLE_USER_LOCK = TRUE,
   ENABLE_HEARTBEAT = TRUE,
   ENABLE_INACTIVITY = TRUE,
+  INACTIVITY_TIMEOUT = 1800,
   ENABLE_ANNOT = FALSE,
   ENABLE_UPGRADE = FALSE,
   ENCRYPTED_EMAIL = FALSE,
diff --git a/components/app/R/server.R b/components/app/R/server.R
index 9dbe31b1d..601dea55e 100644
--- a/components/app/R/server.R
+++ b/components/app/R/server.R
@@ -1249,7 +1249,7 @@ app_server <- function(input, output, session) {
       inactivityCounter(0) # Reset counter on any user activity
     })
 
-    inactivityControl <- start_inactivityControl(session, timeout = 1800, inactivityCounter)
+    inactivityControl <- start_inactivityControl(session, timeout = opt$INACTIVITY_TIMEOUT, inactivityCounter)
     observe({
       inactivityControl()
     })