diff --git a/options/default.nix b/options/default.nix
index da2d282..e2e9cc3 100644
--- a/options/default.nix
+++ b/options/default.nix
@@ -14,6 +14,7 @@
     hostname = lib.mkOption {
       type = lib.types.str;
     };
+    networking.disableWaitOnline = lib.mkEnableOption "disable waiting for network";
     networking.externalInterface = lib.mkOption {
       type = lib.types.str;
       default = "eth0";
diff --git a/profiles/homeserver.nix b/profiles/homeserver.nix
index d2070a6..ceaea09 100644
--- a/profiles/homeserver.nix
+++ b/profiles/homeserver.nix
@@ -7,6 +7,7 @@
   profile = {
     hostname = "homeserver";
     networking.externalInterface = "enp9s0";
+    networking.disableWaitOnline = true;
     user = {
       name = "homeserver";
       fullName = "Homeserver";
diff --git a/system/default.nix b/system/default.nix
index c7a16ad..5939891 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -14,6 +14,7 @@
 
   security.sudo.wheelNeedsPassword = config.profile.security.sudo.wheelNeedsPassword;
   networking.hostName = config.profile.hostname;
+  systemd.services.NetworkManager-wait-online.enable = !config.profile.networking.disableWaitOnline;
 
 
   nixpkgs.config.allowUnfree = true;