diff --git a/lib/base.php b/lib/base.php
index 68eab7c4ac..fe7419e6ff 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -922,6 +922,9 @@ class OC {
 
 		$request = \OC::$server->getRequest();
 		$requestPath = $request->getRawPathInfo();
+		if ($requestPath === '/heartbeat') {
+			return;
+		}
 		if (substr($requestPath, -3) !== '.js') { // we need these files during the upgrade
 			self::checkMaintenanceMode();
 			self::checkUpgrade();