diff --git a/nix/pkgs/ap.nix b/nix/pkgs/ap.nix
index 3e57358..ae984f5 100644
--- a/nix/pkgs/ap.nix
+++ b/nix/pkgs/ap.nix
@@ -160,6 +160,9 @@ in ''
   '') config.site.sshPubKeys}
 
   # System configuration
+  ${uciDeleteAll "switch.@switch_vlan"}
+  ${uciDeleteAll "wireless.@wifi"}
+
   uci batch <<__UCI__
   set system.@system[0].hostname=${hostName}
   set dhcp.@dnsmasq[0].enabled=0
@@ -175,8 +178,6 @@ in ''
 
   # Switch config
   ${optionalString hasSwitch ''
-    ${uciDeleteAll "switch.@switch_vlan"}
-
     # Ports ${portsDoc}
     ${concatMapStrings (net: ''
       add network switch_vlan
@@ -226,8 +227,6 @@ in ''
     '') (builtins.attrNames hostConfig.interfaces)
    }
 
-  ${uciDeleteAll "wireless.@wifi"}
-
   ${concatStrings (imap0 (index: path:
     let
       radioConfig = hostConfig.wifi.${path};