diff --git a/packages/bsp/common/usr/lib/armbian/armbian-firstlogin b/packages/bsp/common/usr/lib/armbian/armbian-firstlogin
index 5217328160..cd01f25c4a 100755
--- a/packages/bsp/common/usr/lib/armbian/armbian-firstlogin
+++ b/packages/bsp/common/usr/lib/armbian/armbian-firstlogin
@@ -674,18 +674,11 @@ if [[ -f /root/.not_logged_in_yet && -n $(tty) ]]; then
 	then
 		echo "Both NetworkManager and systemd-networkd services are enabled."
 		echo "This is known to cause problems with network startup."
-		# If no display manager was found, assume this is a server
-		# with network managed by systemd-networkd. Otherwise, assume
-		# it is a workstation with network managed by NetworkManager.
-		if [[ "${desktop_dm}" == "none" ]]; then
-			echo "No Display Manager detected: NetworkManager will be disabled"
-			systemctl stop NetworkManager
-			systemctl disable NetworkManager
-		else
-			echo "${desktop_dm} Display Manager detected: systemd-networkd will be disabled"
-			systemctl stop systemd-networkd
-			systemctl disable systemd-networkd
-		fi
+		echo "systemd-networkd will be disabled..."
+		sleep 30 # Give the user time to see the message
+		systemctl stop systemd-networkd
+		systemctl disable systemd-networkd
+		echo "systemd-networkd has been disabled."
 	fi
 
 	if