diff --git a/roles/network/tasks/rpi_debian.yml b/roles/network/tasks/rpi_debian.yml
index 7020ce7df..1df7b4fd9 100644
--- a/roles/network/tasks/rpi_debian.yml
+++ b/roles/network/tasks/rpi_debian.yml
@@ -64,8 +64,8 @@
 - name: Clone wifi if needed
   systemd:
     name: iiab-clone-wifi
-    state: started
-  when: wifi_up_down and can_be_ap
+    state: restarted
+  when: wifi_up_down and can_be_ap and ansible_ap0 is undefined
 
 - name: Restart the networking service if appropriate
   systemd:
diff --git a/roles/network/tasks/sysd-netd-debian.yml b/roles/network/tasks/sysd-netd-debian.yml
index 0a584f89b..57c70e889 100644
--- a/roles/network/tasks/sysd-netd-debian.yml
+++ b/roles/network/tasks/sysd-netd-debian.yml
@@ -54,8 +54,8 @@
 - name: Clone wifi if needed
   systemd:
     name: iiab-clone-wifi
-    state: started
-  when: wifi_up_down and can_be_ap
+    state: restarted
+  when: wifi_up_down and can_be_ap and ansible_ap0 is undefined
 
 - name: Enable & Restart systemd-networkd.service
   systemd: