diff --git a/modules/matrix.nix b/modules/matrix.nix
index 967e9d9..b83e3f4 100644
--- a/modules/matrix.nix
+++ b/modules/matrix.nix
@@ -4,8 +4,9 @@
     enable = true;
     withJemalloc = true;
 
-    settings = {
+    settings = rec {
       server_name = "coded.codes";
+      auto_join_rooms = [ "#general:${server_name}" ];
       enable_registration = true;
       registration_requires_token = true;
       registration_shared_secret = "!!registration_shared_secret!!";