diff --git a/feeds/tip/cloud_discovery/files/etc/init.d/cloud_discover b/feeds/tip/cloud_discovery/files/etc/init.d/cloud_discover
index 9c2605b49..2c948a7bf 100755
--- a/feeds/tip/cloud_discovery/files/etc/init.d/cloud_discover
+++ b/feeds/tip/cloud_discovery/files/etc/init.d/cloud_discover
@@ -18,10 +18,12 @@ start_service() {
 		/usr/share/ucentral/capabilities.uc
 	}
 
-	/usr/share/ucentral/ucentral.uc /etc/ucentral/ucentral.cfg.0000000001 > /dev/null
+	local valid=$(cat /etc/ucentral/gateway.json | jsonfilter -e '@["valid"]')
+	[ "$valid" == "true" ] || 
+		/usr/share/ucentral/ucentral.uc /etc/ucentral/ucentral.cfg.0000000001 > /dev/null
 
 	[ "$(fw_printenv -n pki2)" -eq 1 ] || {
-		/etc/init.d/firstcontact start
+		[ -f /etc/ucentral/gateway.json ] || /etc/init.d/firstcontact start
 		return
 	}