diff --git a/roles/network/templates/hostapd/iiab-hotspot-off b/roles/network/templates/hostapd/iiab-hotspot-off
index 78d86cdd1..eb5951c6b 100755
--- a/roles/network/templates/hostapd/iiab-hotspot-off
+++ b/roles/network/templates/hostapd/iiab-hotspot-off
@@ -1,4 +1,8 @@
 #!/bin/bash
+{% if not network_enabled %}
+echo -e "Networking role disabled\n"
+echo -e "For details, see: https://github.com/iiab/iiab/pull/3302\n"
+{% else %}
 sed -i -e "s/^HOSTAPD_ENABLED.*/HOSTAPD_ENABLED=False/" {{ iiab_env_file }}
 systemctl disable hostapd
 systemctl stop hostapd
@@ -36,3 +40,4 @@ exit 0
 {% endif %}
 #wifi_up_down
 {% endif %}
+{% endif %}
diff --git a/roles/network/templates/hostapd/iiab-hotspot-on b/roles/network/templates/hostapd/iiab-hotspot-on
index 41b5357a7..04d551774 100755
--- a/roles/network/templates/hostapd/iiab-hotspot-on
+++ b/roles/network/templates/hostapd/iiab-hotspot-on
@@ -1,4 +1,8 @@
 #!/bin/bash
+{% if not network_enabled %}
+echo -e "Networking role disabled\n"
+echo -e "For details, see: https://github.com/iiab/iiab/pull/3302\n"
+{% else %}
 {% if not can_be_ap %}
 echo -e "\nUH-OH: Your Wi-Fi firmware doesn't support AP mode, according to 'iw list'\n"
 echo -e "If you add Wi-Fi hardware, run 'cd /opt/iiab/iiab' then 'sudo ./iiab-network'\n"
@@ -45,3 +49,4 @@ exit 0
 #wifi_up_down
 {% endif %}
 {% endif %}
+{% endif %}