diff --git a/CHANGELOG.md b/CHANGELOG.md
index 14febc7a..86d1d13a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file
 automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## v6.5.1 - 2017-12-11
+
+* Avoid marking the supervisor as unhealthy if update is not happening because it's in offline mode #534 [Pablo Carranza Velez]
+
 ## v6.5.0 - 2017-12-11
 
 * Add a /v1/healthy endpoint that fails if the supervisor is unhealthy, and a HEALTHCHECK command to the Dockerfile that uses it #530 [Pablo Carranza Velez]
diff --git a/package.json b/package.json
index 9903e5d6..bbbecbd9 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "resin-supervisor",
   "description": "This is resin.io's Supervisor, a program that runs on IoT devices and has the task of running user Apps (which are Docker containers), and updating them as Resin's API informs it to.",
-  "version": "6.5.0",
+  "version": "6.5.1",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
diff --git a/src/application.coffee b/src/application.coffee
index 98df43e7..ccb7fe14 100644
--- a/src/application.coffee
+++ b/src/application.coffee
@@ -137,7 +137,7 @@ application.localMode = false
 
 application.healthy = ->
 	timeSinceLastCycle = process.hrtime(updateStatus.lastFullUpdateCycle)[0] * 1000
-	return updateStatus.currentlyDownloading or timeSinceLastCycle - updateStatus.timeSpentPulling <= 2 * config.appUpdatePollInterval
+	return bootstrap.offlineMode or updateStatus.currentlyDownloading or timeSinceLastCycle - updateStatus.timeSpentPulling <= 2 * config.appUpdatePollInterval
 
 application.logSystemMessage = logSystemMessage = (message, obj, eventName) ->
 	logger.log({ m: message, s: 1 })