diff --git a/modules/nixos/system/network/wireguard/default.nix b/modules/nixos/system/network/wireguard/default.nix
index c8a43f5..a40be32 100644
--- a/modules/nixos/system/network/wireguard/default.nix
+++ b/modules/nixos/system/network/wireguard/default.nix
@@ -18,7 +18,7 @@ in
           listenPort = 1515;
           mtu = 1340;
           peers = 
-            if (config.syscfg.server ? wireguard) then
+            if (config.syscfg.server ? wireguard && config.syscfg.server.wireguard) then
               map (p: {
                 name = p.syscfg.hostname;
                 publicKey = p.syscfg.net.wg.pubkey;
@@ -37,10 +37,6 @@ in
     systemd.services."wireguard-wg0" = {
       after = [ "network-online.target" "nss-lookup.target" ];
       wants = [ "network-online.target" "nss-lookup.target" ];
-      serviceConfig = {
-        Restart = "on-failure";
-        RestartSec = "5s";
-      };
     };
   };
 }