diff --git a/recipes-bsp/mac-address-set/files/mac-address-set.sh b/recipes-bsp/mac-address-set/files/mac-address-set.sh
index e46c1f3..8bd9cc0 100755
--- a/recipes-bsp/mac-address-set/files/mac-address-set.sh
+++ b/recipes-bsp/mac-address-set/files/mac-address-set.sh
@@ -66,8 +66,15 @@ wait_on() {
 	fi
 	log_info "$device not ready"
 	log_info "Waiting...."
+	wait_timeout=0
 	while ! $cmd "$device" > /dev/null 2>/dev/null; do
-		sleep 1
+		if [ $wait_timeout -gt 10 ]; then
+			log_warning "Timeout after 10 seconds, exiting now.."
+			break
+		else
+			sleep 1
+		fi
+		wait_timeout=$(($wait_timeout+1))
 	done
 	log_info "$device ready"
 }