diff --git a/modules/base/network.nix b/modules/base/network.nix
index 81cb9e3..7d22665 100644
--- a/modules/base/network.nix
+++ b/modules/base/network.nix
@@ -19,6 +19,11 @@
   networking.useNetworkd = true;
   systemd.network.enable = true;
 
+  # The notion of "online" is a broken concept
+  # https://github.com/nix-community/srvos/blob/main/nixos/common/networking.nix
+  systemd.services.NetworkManager-wait-online.enable = false;
+  systemd.network.wait-online.enable = false;
+
   # systemd-resolved provides DNS resolution to local applications through
   # D-Bus, NSS, and a local stub resolver on 127.0.0.53. It implements caching
   # and DNSSEC validation. We configure it to only, and always, use
diff --git a/modules/desktop/network.nix b/modules/desktop/network.nix
index 248ab4e..1265229 100644
--- a/modules/desktop/network.nix
+++ b/modules/desktop/network.nix
@@ -22,12 +22,4 @@
       }
     ];
   };
-
-  # systemd-networkd-wait-online can timeout and fail if there are no network
-  # interfaces available for it to manage. When systemd-networkd is enabled but
-  # a different service is responsible for managing the system's internet
-  # connection (for example, NetworkManager), this service is unnecessary and
-  # can be disabled.
-  # https://search.nixos.org/options?channel=24.05&show=systemd.network.wait-online.enable
-  systemd.network.wait-online.enable = false;
 }