diff --git a/package.json b/package.json
index 3fffe05d..8021b0a0 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "knex": "~0.7.3",
     "lodash": "^3.0.0",
     "mixpanel": "0.0.20",
-    "network-checker": "~0.0.2",
+    "network-checker": "~0.0.3",
     "ngrok": "~0.1.97",
     "pinejs-client": "^1.2.0",
     "pubnub": "~3.6.4",
diff --git a/src/config.coffee b/src/config.coffee
index c2006b9f..cc80e3d6 100644
--- a/src/config.coffee
+++ b/src/config.coffee
@@ -24,8 +24,6 @@ module.exports = config =
 	appUpdatePollInterval: checkInt(process.env.APPLICATION_UPDATE_POLL_INTERVAL) ? 60000
 	successMessage: 'SUPERVISOR OK'
 
-config.heartbeatEndpoint = config.apiEndpoint + '/ping'
-
 config.supervisorContainer =
 		Volumes:
 			'/boot/config.json': {}
diff --git a/src/utils.coffee b/src/utils.coffee
index c644c480..d3c8f6f3 100644
--- a/src/utils.coffee
+++ b/src/utils.coffee
@@ -5,6 +5,7 @@ config = require './config'
 mixpanel = require 'mixpanel'
 networkCheck = require 'network-checker'
 blink = require('blinking')(config.ledFile)
+url = require 'url'
 
 utils = exports
 
@@ -64,9 +65,12 @@ networkPattern =
 	pause: 1000
 
 exports.blink = blink
+
 exports.connectivityCheck = _.once ->
-	networkCheck.monitorURL 
-		url: config.heartbeatEndpoint
+	parsedUrl = url.parse(config.apiEndpoint)
+	networkCheck.monitorHost 
+		host: parsedUrl.hostname
+		port: parsedUrl.port ? (if parsedUrl.protocol is 'https:' then 443 else 80)
 		interval: 10 * 1000
 		(connected) ->
 			if connected