diff --git a/omr-tracker/files/bin/omr-tracker-server b/omr-tracker/files/bin/omr-tracker-server
index dc23fc9c6..6efd2524d 100755
--- a/omr-tracker/files/bin/omr-tracker-server
+++ b/omr-tracker/files/bin/omr-tracker-server
@@ -130,6 +130,7 @@ _check_master() {
 	[ "$master" = "1" ] && [ -n "$ip" ] && [ "$disabled" != "1" ] && {
 		check_ip() {
 			local ipd=$1
+			[ -n "$serverip" ] && [ "$server_ping" = true ] && return
 			ipresolve="$(resolveip -4 $ipd | head -n 1)"
 			if [ -n "$ipresolve" ]; then
 				serverip="$ipresolve"
@@ -282,6 +283,7 @@ _check_backup() {
 	[ "$backup" = "1" ] && [ -n "$ip" ] && [ "$disabled" != "1" ] && {
 		check_ip() {
 			local ipd=$1
+			[ -n "$serverip" ] && [ "$server_ping" = true ] && return
 			ipresolve="$(resolveip -4 $ipd | head -n 1)"
 			if [ -n "$ipresolve" ]; then
 				serverip="$ipresolve"