diff --git a/app.js b/app.js
index dda4e5c9..46c88fcd 100644
--- a/app.js
+++ b/app.js
@@ -128,9 +128,11 @@ app.use(urlPrefix + '/lotOccupancies', sessionChecker, routerLotOccupancies);
 app.use(urlPrefix + '/workOrders', sessionChecker, routerWorkOrders);
 app.use(urlPrefix + '/reports', sessionChecker, routerReports);
 app.use(urlPrefix + '/admin', sessionChecker, permissionHandlers.adminGetHandler, routerAdmin);
-app.all(urlPrefix + '/keepAlive', (_request, response) => {
-    response.json(true);
-});
+if (configFunctions.getProperty('session.doKeepAlive')) {
+    app.all(urlPrefix + '/keepAlive', (_request, response) => {
+        response.json(true);
+    });
+}
 app.use(urlPrefix + '/login', routerLogin);
 app.get(urlPrefix + '/logout', (request, response) => {
     if (Object.hasOwn(request.session, 'user') &&
diff --git a/app.ts b/app.ts
index c680ffec..15cbfc83 100644
--- a/app.ts
+++ b/app.ts
@@ -251,9 +251,11 @@ app.use(
   routerAdmin
 )
 
-app.all(urlPrefix + '/keepAlive', (_request, response) => {
-  response.json(true)
-})
+if (configFunctions.getProperty('session.doKeepAlive')) {
+  app.all(urlPrefix + '/keepAlive', (_request, response) => {
+    response.json(true)
+  })
+}
 
 app.use(urlPrefix + '/login', routerLogin)
 
diff --git a/cypress/e2e/xx-other/keepAlive.cy.d.ts b/cypress/e2e/xx-other/keepAlive.cy.d.ts
new file mode 100644
index 00000000..e69de29b
diff --git a/cypress/e2e/xx-other/keepAlive.cy.js b/cypress/e2e/xx-other/keepAlive.cy.js
new file mode 100644
index 00000000..0741cb75
--- /dev/null
+++ b/cypress/e2e/xx-other/keepAlive.cy.js
@@ -0,0 +1,7 @@
+describe('Keep Alive', () => {
+    it('Returns true', () => {
+        cy.request('/keepAlive').then((response) => {
+            expect(response.body).eq(true);
+        });
+    });
+});
diff --git a/cypress/e2e/xx-other/keepAlive.cy.ts b/cypress/e2e/xx-other/keepAlive.cy.ts
new file mode 100644
index 00000000..3d9da018
--- /dev/null
+++ b/cypress/e2e/xx-other/keepAlive.cy.ts
@@ -0,0 +1,10 @@
+/* eslint-disable promise/always-return */
+/* eslint-disable promise/catch-or-return */
+
+describe('Keep Alive', () => {
+  it('Returns true', () => {
+    cy.request('/keepAlive').then((response) => {
+      expect(response.body).eq(true)
+    })
+  })
+})
diff --git a/data/config.testing.js b/data/config.testing.js
index e6c41bee..a3032d42 100644
--- a/data/config.testing.js
+++ b/data/config.testing.js
@@ -1,6 +1,7 @@
 import { config as cemeteryConfig } from './config.cemetery.ssm.js';
 export const config = Object.assign({}, cemeteryConfig);
 config.application.useTestDatabases = true;
+config.session.doKeepAlive = true;
 config.users = {
     testing: ['*testView', '*testUpdate', '*testAdmin'],
     canLogin: ['*testView', '*testUpdate', '*testAdmin'],
diff --git a/data/config.testing.ts b/data/config.testing.ts
index 5d4f82d6..dea03cc0 100644
--- a/data/config.testing.ts
+++ b/data/config.testing.ts
@@ -4,6 +4,8 @@ export const config = Object.assign({}, cemeteryConfig)
 
 config.application.useTestDatabases = true
 
+config.session.doKeepAlive = true
+
 config.users = {
   testing: ['*testView', '*testUpdate', '*testAdmin'],
   canLogin: ['*testView', '*testUpdate', '*testAdmin'],