diff --git a/packages/bsp/common/usr/lib/armbian/armbian-firstlogin b/packages/bsp/common/usr/lib/armbian/armbian-firstlogin
index e73b46b4f..9881ba7cd 100755
--- a/packages/bsp/common/usr/lib/armbian/armbian-firstlogin
+++ b/packages/bsp/common/usr/lib/armbian/armbian-firstlogin
@@ -270,6 +270,10 @@ if [[ -f /root/.not_logged_in_yet && -n $(tty) ]]; then
 	desktop_lightdm=$(dpkg-query -W -f='${db:Status-Abbrev}\n' lightdm 2>/dev/null)
 	desktop_gdm3=$(dpkg-query -W -f='${db:Status-Abbrev}\n' gdm3 2>/dev/null)
 
+	echo -e "\nWaiting for system to finish booting...\n"
+
+	systemctl is-system-running --wait
+
 	if [ "$IMAGE_TYPE" != "nightly" ]; then
 		if [ "$BRANCH" == "dev" ]; then
 			echo -e "\nYou are using an Armbian preview build !!!"