diff --git a/src/app.coffee b/src/app.coffee
index d1999c5a..73b1363c 100644
--- a/src/app.coffee
+++ b/src/app.coffee
@@ -11,7 +11,7 @@ utils.mixpanelTrack('Supervisor start')
 
 
 console.log('Starting connectivity check..')
-utils.connectivityCheck(true)
+utils.connectivityCheck()
 
 knex('config').select('value').where(key: 'uuid').then ([ uuid ]) ->
 	if not uuid?.value
diff --git a/src/utils.coffee b/src/utils.coffee
index f63008a7..54a68c8e 100644
--- a/src/utils.coffee
+++ b/src/utils.coffee
@@ -77,7 +77,7 @@ exports.checkConnectivity = ->
 
 exports.connectivityCheck = do ->
 	connectivityState = true # Used to prevent multiple messages when disconnected
-	(continuous = false) ->
+	_check = ->
 		utils.checkConnectivity()
 		.then (connected) ->
 			if not connected
@@ -89,12 +89,10 @@ exports.connectivityCheck = do ->
 				.then ->
 					# Clear the blinks after 2 second
 					clearInterval(interval)
-					utils.connectivityCheck(continuous)
+					_check()
 			else
 				if not connectivityState
 					console.log('Internet Connectivity: OK')
 					connectivityState = true
-				if continuous
-					setTimeout(->
-						utils.connectivityCheck(continuous)
-					, 10 * 1000) # Every 10 seconds perform this check.
\ No newline at end of file
+				setTimeout(_check, 10 * 1000) # Every 10 seconds perform this check.
+	return _.once(_check)