diff --git a/feeds/tip/cloud_discovery/files/usr/bin/cloud_discovery b/feeds/tip/cloud_discovery/files/usr/bin/cloud_discovery
index c8ee6dc45..dba3d35ed 100755
--- a/feeds/tip/cloud_discovery/files/usr/bin/cloud_discovery
+++ b/feeds/tip/cloud_discovery/files/usr/bin/cloud_discovery
@@ -260,11 +260,11 @@ function interval_handler() {
 		if (!time_is_valid())
 			return;
 
-		discovery_method = DISCOVER_DHCP;
-		if (discover_dhcp())
+		if (system('/usr/bin/est_client enroll'))
 			return;
 
-		if (system('/usr/bin/est_client enroll'))
+		discovery_method = DISCOVER_DHCP;
+		if (discover_dhcp())
 			return;
 
 		discovery_method = DISCOVER_FLASH;