diff --git a/modules/common/matrix.nix b/modules/common/matrix.nix
index 26b2c26..015c3f4 100644
--- a/modules/common/matrix.nix
+++ b/modules/common/matrix.nix
@@ -160,7 +160,8 @@
     };
   };
 
-  systemd.services.matrix-synapse.requires = [ "postgresql.service" "nginx.service" "keycloak.service" ];
+  systemd.services.matrix-synapse.requires = [ "postgresql.service" ];
+  systemd.services.matrix-synapse.after = [ "nginx.service" "keycloak.service" ];
 
 } (let isDerived = base != null;
 in if isDerived
@@ -186,9 +187,10 @@
         "${base.config.systemd.services.matrix-synapse.serviceConfig.ExecStart}");
 
     systemd.services.matrix-synapse.preStart = lib.mkForce
+      ("while [[ \"$(${pkgs.curl}/bin/curl -s -o /dev/null -w ''%{http_code}'' https://login.clicks.codes)\" != \"200\" ]]; do sleep 5; done; " +
       (builtins.replaceStrings [ "${synapse_cfgfile}" ]
         [ "${config.scalpel.trafos."synapse.yaml".destination}" ]
-        "${base.config.systemd.services.matrix-synapse.preStart}");
+        "${base.config.systemd.services.matrix-synapse.preStart}"));
 
     systemd.services.matrix-synapse.restartTriggers = [ synapse_cfgfile ];