diff --git a/roles/network/templates/hostapd/hostapd.service.j2 b/roles/network/templates/hostapd/hostapd.service.j2
index abc718d0c..11318a2d7 100644
--- a/roles/network/templates/hostapd/hostapd.service.j2
+++ b/roles/network/templates/hostapd/hostapd.service.j2
@@ -5,6 +5,8 @@ After=network-pre.target
 {% if is_raspbian %}
 Before=dhcpcd.service
 {% endif %}
+Before=wpa_supplicant.service
+Before=wpa_supplicant@{{ discovered_wireless_iface }}.service
 Before=network.target
 
 [Service]