diff --git a/modules/services/matrix/synapse/default.nix b/modules/services/matrix/synapse/default.nix
index 70ffc73..cdd503a 100644
--- a/modules/services/matrix/synapse/default.nix
+++ b/modules/services/matrix/synapse/default.nix
@@ -5,19 +5,24 @@ let
   cfg = config.services.matrix-synapse-custom;
 
   # Custom package that tracks with the latest release of Synapse.
-  package = pkgs.matrix-synapse.overridePythonAttrs (
-    old: rec {
-      pname = "matrix-synapse";
-      version = "1.58.0";
-
-      src = pkgs.python3Packages.fetchPypi {
-        inherit pname version;
-        sha256 = "sha256-cY3rtmaaAimEQPU4wcMEy/QysPNCdk7yptrkctnLfDA=";
-      };
+  package = pkgs.matrix-synapse.overridePythonAttrs (old: rec {
+    pname = "matrix-synapse";
+    version = "1.58.0";
+
+    src = pkgs.python3Packages.fetchPypi {
+      inherit pname version;
+      sha256 = "sha256-cY3rtmaaAimEQPU4wcMEy/QysPNCdk7yptrkctnLfDA=";
+    };
+
+    patches = (old.patches or [ ]) ++ [
+      (fetchpatch {
+        src = "https://patch-diff.githubusercontent.com/raw/matrix-org/synapse/pull/12721.patch";
+        sha256 = "sha256-cY3rtmaaAimEQPU4wcMEy/AAAAAAAA7yptrkctnLfDA=";
+      })
+    ];
 
-      doCheck = false;
-    }
-  );
+    doCheck = false;
+  });
 
   packageWithModules = package.python.withPackages (ps: [
     (package.python.pkgs.toPythonModule package)
diff --git a/pkgs/heisenbridge.nix b/pkgs/heisenbridge.nix
index cfbf1c1..77e535f 100644
--- a/pkgs/heisenbridge.nix
+++ b/pkgs/heisenbridge.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, fetchpatch, python3 }:
+{ lib, fetchFromGitHub, python3 }:
 python3.pkgs.buildPythonApplication rec {
   pname = "heisenbridge";
   version = "1.10.1";