diff --git a/ProcessMaker/Repositories/SettingsConfigRepository.php b/ProcessMaker/Repositories/SettingsConfigRepository.php
index b04623e35a..d392504c54 100644
--- a/ProcessMaker/Repositories/SettingsConfigRepository.php
+++ b/ProcessMaker/Repositories/SettingsConfigRepository.php
@@ -45,6 +45,12 @@ public function get($key, $default = null)
             return $this->getMany($key);
         }
 
+        if ($key === 'session.lifetime') {
+            $settingValue = $this->getFromSettings($key);
+
+            return $settingValue ?? $default;
+        }
+
         if (Arr::has($this->items, $key)) {
             return Arr::get($this->items, $key);
         }
diff --git a/resources/js/next/config/session.js b/resources/js/next/config/session.js
index 6390c538e8..86d35bba19 100644
--- a/resources/js/next/config/session.js
+++ b/resources/js/next/config/session.js
@@ -10,7 +10,6 @@ export default () => {
   const closeSessionModal = getGlobalPMVariable("closeSessionModal");
   const alert = getGlobalPMVariable("alert");
   const user = getGlobalPMVariable("user");
-  const sessionModal = getGlobalPMVariable("sessionModal");
 
   const isSameDevice = (e) => {
     const localDeviceId = Vue.$cookies.get(e.device_variable);
@@ -26,6 +25,7 @@ export default () => {
     const AccountTimeoutWorker = new Worker(timeoutScript);
 
     AccountTimeoutWorker.addEventListener("message", (e) => {
+      const sessionModal = getGlobalPMVariable("sessionModal");
       if (e.data.method === "countdown") {
         sessionModal(
           "Session Warning",