diff --git a/core/src/session-heartbeat.js b/core/src/session-heartbeat.js
index 153408b767bb0..83fa4aeaf124a 100644
--- a/core/src/session-heartbeat.js
+++ b/core/src/session-heartbeat.js
@@ -128,14 +128,17 @@ const registerAutoLogout = () => {
 		lastActive = e.newValue
 	})
 
-	setInterval(function() {
+	let intervalId = 0
+	const logoutCheck = () => {
 		const timeout = Date.now() - config.session_lifetime * 1000
 		if (lastActive < timeout) {
+			clearTimeout(intervalId)
 			console.info('Inactivity timout reached, logging out')
 			const logoutUrl = generateUrl('/logout') + '?requesttoken=' + encodeURIComponent(getRequestToken())
 			window.location = logoutUrl
 		}
-	}, 1000)
+	}
+	intervalId = setInterval(logoutCheck, 1000)
 }
 
 /**