diff --git a/roles/network/tasks/hostapd.yml b/roles/network/tasks/hostapd.yml
index 83ad15424..dd6b82698 100644
--- a/roles/network/tasks/hostapd.yml
+++ b/roles/network/tasks/hostapd.yml
@@ -155,7 +155,7 @@
     enabled: yes
     daemon_reload: yes
   with_items:
-#    - hostapd.service
+    - hostapd.service
     - clone-wifi.service
     - wifi-test.service
   when: hostapd_enabled and wifi_up_down
diff --git a/roles/network/templates/hostapd/test-wifi b/roles/network/templates/hostapd/test-wifi
index 7a8418bc1..3c948fbcb 100755
--- a/roles/network/templates/hostapd/test-wifi
+++ b/roles/network/templates/hostapd/test-wifi
@@ -69,15 +69,5 @@ if [ $CHAN -ne $HOSTAPD ]; then
     if [ $NETPLAN -eq 1 ]; then
         systemctl restart netplan-wpa-$IFACE.service
     fi
-else
-    #we started it stop it now, dhcpcd should launch it's version anyway
-#    if [ $RASPBIAN -eq 1 ]; then
-#        systemctl stop wpa_supplicant
-#    fi
-    # firmware might force the need to restart anyway
-#    systemctl stop wpa_supplicant
-    systemctl start hostapd
-#    systemctl start wpa_supplicant
 fi
-systemctl start dnsmasq.service
 exit 0