diff --git a/hosts/midas/services/default.nix b/hosts/midas/services/default.nix
index 525103ad..27d5c65d 100644
--- a/hosts/midas/services/default.nix
+++ b/hosts/midas/services/default.nix
@@ -4,7 +4,6 @@
     forgejo.enable = true;
     icecast.enable = true;
     jellyfin.enable = true;
-    mastodon.enable = true;
     matrix-synapse.enable = true;
     nextcloud.enable = true;
     nfs.server.enable = true;
diff --git a/modules/system/secrets/default.nix b/modules/system/secrets/default.nix
index ad527379..743b0030 100644
Binary files a/modules/system/secrets/default.nix and b/modules/system/secrets/default.nix differ
diff --git a/modules/system/services/server/default.nix b/modules/system/services/server/default.nix
index bbdf111b..052102d8 100644
--- a/modules/system/services/server/default.nix
+++ b/modules/system/services/server/default.nix
@@ -6,7 +6,6 @@
     ./icecast
     ./jellyfin
     ./mailserver
-    ./mastodon
     ./matrix
     ./minecraft
     ./mysql
diff --git a/modules/system/services/server/mastodon/default.nix b/modules/system/services/server/mastodon/default.nix
deleted file mode 100644
index 7a8786b2..00000000
--- a/modules/system/services/server/mastodon/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ config, lib, pkgs, ... }:
-{
-  config = lib.mkIf config.services.mastodon.enable {
-    services.mastodon = {
-      localDomain = "social.nixfox.ca";
-      streamingProcesses = 4;
-      configureNginx = true;
-      smtp = {
-        createLocally = false;
-        host = "mx.nixfox.ca";
-        port = 587;
-        authenticate = true;
-        fromAddress = "NixFox Mastodon <noreply@nixfox.ca>";
-        user = "noreply@nixfox.ca";
-        passwordFile = pkgs.writeText "smtp_pass.txt" config.secrets.mailPass.nixfoxNoReply;
-      };
-    };
-    environment.persistence."/persist".directories = [ "/var/lib/mastodon" ];
-  };
-}