diff --git a/core/js/js.js b/core/js/js.js
index 7f45a9b622..80e9ac3f94 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -741,6 +741,8 @@ function initCore() {
 	 * time out
 	 */
 	function initSessionHeartBeat(){
+		// max interval in seconds set to 24 hours
+		var maxInterval = 24 * 3600;
 		// interval in seconds
 		var interval = 900;
 		if (oc_config.session_lifetime) {
@@ -750,6 +752,9 @@ function initCore() {
 		if (interval < 60) {
 			interval = 60;
 		}
+		if (interval > maxInterval) {
+			interval = maxInterval;
+		}
 		OC.Router.registerLoadedCallback(function(){
 			var url = OC.Router.generate('heartbeat');
 			setInterval(function(){