diff --git a/recipes-extended/um-service-cfg/files/um-service-config.sh b/recipes-extended/um-service-cfg/files/um-service-config.sh
index e835248..1e57fa8 100644
--- a/recipes-extended/um-service-cfg/files/um-service-config.sh
+++ b/recipes-extended/um-service-cfg/files/um-service-config.sh
@@ -24,19 +24,22 @@ done
 
 source $UM_CONFIG
 
-max_retry=90
+if [[ $USER_MODULE_status = "disabled" ]]; then
+    exit 1
+fi
+
+max_retry=30
 counter=0
 
 until [[ counter -ge $max_retry ]]
 do
   sleep 1
   echo "Probing um. #$counter"
-  ping -qc 1 $USER_MODULE_ipv4_addr && break
+  ping -qc 1 -W 1 $USER_MODULE_ipv4_addr && break
   ((counter++))
 done
 
 
-
 # Decide which config to load depending on the sw revision
 if `nc -z $USER_MODULE_ipv4_addr 7000` ; then
   echo "New UM software detected"
@@ -46,11 +49,4 @@ else
   cat $UM_PORTS_V1 >> $UM_CONFIG
 fi
 
-# source all fetched informations
-source $UM_CONFIG
-
-if [[ $USER_MODULE_status = "disabled" ]]; then
-    exit 1
-elif [[ $USER_MODULE_status = "okay" ]]; then
-    exit 0
-fi
+exit 0