diff --git a/src/app.coffee b/src/app.coffee
index 6c211283..24686df5 100644
--- a/src/app.coffee
+++ b/src/app.coffee
@@ -33,6 +33,8 @@ ensureConnected = (continuous = false) ->
 					ensureConnected(continuous)
 				, 10 * 1000) # Every 10 seconds perform this check.
 
+console.log('Starting connectivity check..')
+ensureConnected(true)
 
 knex('config').select('value').where(key: 'uuid').then ([ uuid ]) ->
 	if not uuid?.value
@@ -92,9 +94,6 @@ knex('config').select('value').where(key: 'uuid').then ([ uuid ]) ->
 	setInterval(updateIpAddr, 30 * 1000) # Every 30s
 	updateIpAddr()
 
-	console.log('Starting connectivity check..')
-	ensureConnected(true)
-
 	# Tell the supervisor updater that we have successfully started, so that it can do whatever it needs to.
 	supervisor.startupSuccessful()