diff --git a/omr-tracker/files/bin/omr-tracker b/omr-tracker/files/bin/omr-tracker
index 9d56f9bf7..8ba1dcf18 100755
--- a/omr-tracker/files/bin/omr-tracker
+++ b/omr-tracker/files/bin/omr-tracker
@@ -376,7 +376,7 @@ while true; do
 								OMR_TRACKER_STATUS="OK"
 							fi
 						fi
-						if [ "$serverip_ping" != false ] && ([ "$OMR_TRACKER_STATUS_MSG" = "" ] || [ "$OMR_TRACKER_STATUS" = "OK" ]) && [ "$OMR_TRACKER_TYPE" != "httping" ] && [ "$OMR_TRACKER_SERVER_HTTP_TEST" = "1" ]; then
+						if [ "$serverip_ping" != false ] && [ "$OMR_TRACKER_STATUS" = "OK" ] && [ "$OMR_TRACKER_TYPE" != "httping" ] && [ "$OMR_TRACKER_SERVER_HTTP_TEST" = "1" ]; then
 							serverip_ping=false
 							config_load openmptcprouter
 							config_foreach _httping_server server $OMR_TRACKER_DEVICE_IP
@@ -388,11 +388,12 @@ while true; do
 								OMR_TRACKER_STATUS="OK"
 								break
 							fi
-						elif [ "$serverip_ping" != false ] && ([ "$OMR_TRACKER_STATUS_MSG" = "" ] || [ "$OMR_TRACKER_STATUS" = "OK" ]); then
+						elif [ "$serverip_ping" != false ]; then
 							OMR_TRACKER_STATUS_MSG=""
 							OMR_TRACKER_STATUS="OK"
 							break
 						fi
+						[ "$OMR_TRACKER_STATUS" = "OK" ] && break
 					elif ! $(exit $status); then
 						OMR_TRACKER_STATUS_MSG="gateway down"
 					fi