diff --git a/usr/lib/archboot/installer/common.sh b/usr/lib/archboot/installer/common.sh
index dbe3c9dcc..f4d42d6f4 100644
--- a/usr/lib/archboot/installer/common.sh
+++ b/usr/lib/archboot/installer/common.sh
@@ -113,6 +113,7 @@ auto_packages() {
     #shellcheck disable=SC2010
     if ls /sys/class/net | grep -q wlan; then
         ! echo "${PACKAGES}" | grep -qw iwd && PACKAGES="${PACKAGES} iwd"
+        ! echo "${PACKAGES}" | grep -qw wpa_supplicant && PACKAGES="${PACKAGES} wpa_supplicant"
     fi
     # only add firmware if already used
     linux_firmware
@@ -129,10 +130,6 @@ auto_packages() {
         PACKAGES="${PACKAGES} amd-ucode"
     fi
     ### HACK:
-    # always add wpa_supplicant
-    PACKAGES="${PACKAGES//\ wpa_supplicant\ / }"
-    PACKAGES="${PACKAGES} wpa_supplicant"
-    ### HACK:
     # always add lvm2, cryptsetup and mdadm
     PACKAGES="${PACKAGES//\ lvm2\ / }"
     PACKAGES="${PACKAGES} lvm2"