diff --git a/hosts/midas/services/default.nix b/hosts/midas/services/default.nix
index 525103ad..3f6af2ed 100644
--- a/hosts/midas/services/default.nix
+++ b/hosts/midas/services/default.nix
@@ -8,13 +8,11 @@
     matrix-synapse.enable = true;
     nextcloud.enable = true;
     nfs.server.enable = true;
-    nginx.enable = true;
     owncast.enable = true;
     transmission.enable = true;
     vaultwarden.enable = true;
     webserver.enable = true;
     wireguard.server.enable = true;
-
     minecraft-servers = {
       enable = true;
       servers = {
diff --git a/hosts/prophet/default.nix b/hosts/prophet/default.nix
index 0efdb011..06c89681 100644
--- a/hosts/prophet/default.nix
+++ b/hosts/prophet/default.nix
@@ -22,7 +22,6 @@
 
   services = {
     mailserver.enable = true;
-    nginx.enable = true;
     wireguard.client.enable = true;
   };
 }
diff --git a/modules/system/services/server/nginx/default.nix b/modules/system/services/server/nginx/default.nix
index 9486f382..7110b64c 100644
--- a/modules/system/services/server/nginx/default.nix
+++ b/modules/system/services/server/nginx/default.nix
@@ -7,10 +7,11 @@
     ./virtualhosts
   ];
 
-  options.services.webserver.enable = lib.mkEnableOption "Enable nginx webpages";
+  options.services.webserver.enable = lib.mkEnableOption "Enable nginx related services";
 
-  config = lib.mkIf config.services.nginx.enable {
+  config = lib.mkIf config.system.server.enable {
     services.nginx = {
+      enable = true;
       recommendedTlsSettings = true;
       recommendedOptimisation = true;
       recommendedGzipSettings = true;