diff --git a/modules/nixos/services/matrix/default.nix b/modules/nixos/services/matrix/default.nix
index 982f9d97..6dcdeb71 100644
--- a/modules/nixos/services/matrix/default.nix
+++ b/modules/nixos/services/matrix/default.nix
@@ -19,12 +19,6 @@
               client_max_body_size 10M;
             '';
           };
-          "~ ^/_hookshot/(.*)" = {
-            proxyPass = "http://127.0.0.1:9000/$1";
-            extraConfig = ''
-              proxy_set_header X-Forwarded-Ssl on;
-            '';
-          };
         };
       }
     ];
@@ -55,7 +49,6 @@
           suppress_key_server_warning = true;
           app_service_config_files = [
             config.age.secrets."files/services/matrix-synapse/whatsapp-registration.yml".path
-            config.age.secrets."files/services/matrix-synapse/hookshot-registration.yml".path
           ];
         };
         extraConfigFiles = [
@@ -97,54 +90,18 @@
           Group = "mautrix-whatsapp";
         };
       };
-      matrix-hookshot = {
-        description = "Matrix <-> Services bridge";
-        wantedBy = [ "multi-user.target" ];
-        after = [ "network.target" "matrix-synapse.service" ];
-        requires = [ "matrix-synapse.service" ];
-        script = "${pkgs.matrix-hookshot}/bin/matrix-hookshot ${config.age.secrets."files/services/matrix-hookshot/config.yml".path} ${config.age.secrets."files/services/matrix-hookshot/registration.yml".path}";
-        serviceConfig = {
-          User = "matrix-hookshot";
-          Group = "matrix-hookshot";
-          WorkingDirectory = "/var/lib/matrix-hookshot";
-        };
-      };
     };
 
     users = {
-      users = {
-        mautrix-whatsapp = {
-          group = "mautrix-whatsapp";
-          home = "/var/lib/mautrix-whatsapp";
-          createHome = true;
-          isSystemUser = true;
-        };
-        matrix-hookshot = {
-          group = "matrix-hookshot";
-          home = "/var/lib/matrix-hookshot";
-          createHome = true;
-          isSystemUser = true;
-        };
-      };
-      groups = {
-        matrix-hookshot = { };
-        mautrix-whatsapp = { };
+      users.mautrix-whatsapp = {
+        group = "mautrix-whatsapp";
+        home = "/var/lib/mautrix-whatsapp";
+        createHome = true;
+        isSystemUser = true;
       };
+      groups.mautrix-whatsapp = { };
     };
 
-    age.secrets."files/services/matrix-hookshot/config.yml" = {
-      file = ../../../../secrets/files/services/matrix-hookshot/config.yml.age;
-      owner = "matrix-hookshot";
-    };
-    age.secrets."files/services/matrix-hookshot/registration.yml" = {
-      file = ../../../../secrets/files/services/matrix-hookshot/registration.yml.age;
-      owner = "matrix-hookshot";
-    };
-    age.secrets."files/services/matrix-hookshot/passkey.pem" = {
-      path = "/var/lib/matrix-hookshot/passkey.pem";
-      file = ../../../../secrets/files/services/matrix-hookshot/passkey.pem.age;
-      owner = "matrix-hookshot";
-    };
     age.secrets."files/services/mautrix-whatsapp/config.yml" = {
       file = ../../../../secrets/files/services/mautrix-whatsapp/config.yml.age;
       owner = "mautrix-whatsapp";
@@ -161,9 +118,5 @@
       file = ../../../../secrets/files/services/mautrix-whatsapp/registration.yml.age;
       owner = "matrix-synapse";
     };
-    age.secrets."files/services/matrix-synapse/hookshot-registration.yml" = {
-      file = ../../../../secrets/files/services/matrix-hookshot/registration.yml.age;
-      owner = "matrix-synapse";
-    };
   };
 }
diff --git a/secrets.nix b/secrets.nix
index 28c27600..9d91702d 100644
--- a/secrets.nix
+++ b/secrets.nix
@@ -78,9 +78,6 @@ in
 
   "secrets/files/programs/transmission/config.json.age".publicKeys = [ elendel ] ++ users;
 
-  "secrets/files/services/matrix-hookshot/config.yml.age".publicKeys = [ marabethia ] ++ users;
-  "secrets/files/services/matrix-hookshot/passkey.pem.age".publicKeys = [ marabethia ] ++ users;
-  "secrets/files/services/matrix-hookshot/registration.yml.age".publicKeys = [ marabethia ] ++ users;
   "secrets/files/services/matrix-synapse/config.yml.age".publicKeys = [ marabethia ] ++ users;
   "secrets/files/services/mautrix-whatsapp/config.yml.age".publicKeys = [ marabethia ] ++ users;
   "secrets/files/services/mautrix-whatsapp/registration.yml.age".publicKeys = [ marabethia ] ++ users;
diff --git a/secrets/files/services/matrix-hookshot/config.yml.age b/secrets/files/services/matrix-hookshot/config.yml.age
deleted file mode 100644
index f94d2b7c..00000000
Binary files a/secrets/files/services/matrix-hookshot/config.yml.age and /dev/null differ
diff --git a/secrets/files/services/matrix-hookshot/passkey.pem.age b/secrets/files/services/matrix-hookshot/passkey.pem.age
deleted file mode 100644
index 12e5db0f..00000000
Binary files a/secrets/files/services/matrix-hookshot/passkey.pem.age and /dev/null differ
diff --git a/secrets/files/services/matrix-hookshot/registration.yml.age b/secrets/files/services/matrix-hookshot/registration.yml.age
deleted file mode 100644
index 2d48460f..00000000
Binary files a/secrets/files/services/matrix-hookshot/registration.yml.age and /dev/null differ