diff --git a/roles/network/tasks/restart.yml b/roles/network/tasks/restart.yml
index b4c7ccce2..cf4d9ee4e 100644
--- a/roles/network/tasks/restart.yml
+++ b/roles/network/tasks/restart.yml
@@ -53,6 +53,10 @@
     creates: /etc/sysconfig/olpc-scripts/setup.d/installed/gateway
   when: iiab_network_mode == "Gateway"
 
+- name: Reload netplan when Wifi is present on Ubuntu 18+
+  shell: netplan apply
+  when: not no_net_restart and is_ubuntu and netplan.stdout.find("yaml") != -1
+
 - name: Waiting {{ hostapd_wait }} seconds for network to stabilize (dnsmasq will fail if br0 isn't in a 'up' state!)
   shell: sleep {{ hostapd_wait }}
 
diff --git a/roles/network/tasks/sysd-netd-debian.yml b/roles/network/tasks/sysd-netd-debian.yml
index 3af9ed8a4..9a478ea4a 100644
--- a/roles/network/tasks/sysd-netd-debian.yml
+++ b/roles/network/tasks/sysd-netd-debian.yml
@@ -55,4 +55,4 @@
     name: systemd-networkd
     enabled: yes
     state: restarted
-  when: not nobridge is defined and not no_net_restart
+  when: not no_net_restart and netplan.stdout.find("yaml") == -1