diff --git a/omr-tracker/files/bin/omr-tracker b/omr-tracker/files/bin/omr-tracker
index 4c829dc43..f8a188aca 100755
--- a/omr-tracker/files/bin/omr-tracker
+++ b/omr-tracker/files/bin/omr-tracker
@@ -363,7 +363,6 @@ while true; do
 								if $(exit $statusb); then
 									OMR_TRACKER_STATUS_MSG=""
 									OMR_TRACKER_STATUS="OK"
-									break
 								else
 									if [ "$OMR_TRACKER_LIST_HOSTS" = "" ]; then
 										OMR_TRACKER_LIST_HOSTS="$OMR_TRACKER_HOST"
@@ -375,7 +374,6 @@ while true; do
 							else
 								OMR_TRACKER_STATUS_MSG=""
 								OMR_TRACKER_STATUS="OK"
-								break
 							fi
 						fi
 						if [ "$serverip_ping" != false ] && [ "$OMR_TRACKER_STATUS" = "OK" ] && [ "$OMR_TRACKER_TYPE" != "httping" ] && [ "$OMR_TRACKER_SERVER_HTTP_TEST" = "1" ]; then
@@ -389,7 +387,7 @@ while true; do
 								OMR_TRACKER_STATUS="OK"
 								break
 							fi
-						else
+						elif [ "$serverip_ping" != false ]; then
 							OMR_TRACKER_STATUS_MSG=""
 							OMR_TRACKER_STATUS="OK"
 							break
@@ -464,7 +462,6 @@ while true; do
 								if $(exit $statusb); then
 									OMR_TRACKER_STATUS_MSG=""
 									OMR_TRACKER_STATUS="OK"
-									break
 								else
 									if [ "$OMR_TRACKER_LIST_HOSTS6" = "" ]; then
 										OMR_TRACKER_LIST_HOSTS6="$OMR_TRACKER_HOST6"
@@ -476,7 +473,6 @@ while true; do
 							else
 								OMR_TRACKER_STATUS_MSG=""
 								OMR_TRACKER_STATUS="OK"
-								break
 							fi
 						fi
 						if [ "$serverip_ping" != false ] && [ "$OMR_TRACKER_STATUS" = "OK" ] && [ "$OMR_TRACKER_TYPE" != "httping" ] && [ "$OMR_TRACKER_SERVER_HTTP_TEST" = "1" ]; then
@@ -490,7 +486,7 @@ while true; do
 								OMR_TRACKER_STATUS="OK"
 								break
 							fi
-						else
+						elif [ "$serverip_ping" != false ]; then
 							OMR_TRACKER_STATUS_MSG=""
 							OMR_TRACKER_STATUS="OK"
 							break