diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers
index cfccd387..ae5395fb 100755
--- a/group_vars/matrix_servers
+++ b/group_vars/matrix_servers
@@ -695,6 +695,10 @@ matrix_mautrix_discord_login_shared_secret: "{{ matrix_synapse_ext_password_prov
 matrix_mautrix_discord_database_engine: "{{ 'postgres' if matrix_postgres_enabled else 'sqlite' }}"
 matrix_mautrix_discord_database_password: "{{ '%s' | format(matrix_homeserver_generic_secret_key) | password_hash('sha512', 'maudiscord.db') | to_uuid }}"
 
+# Enabling bridge.restricted_rooms for this bridge does not work well with Conduit, so we disable it by default.
+# See: todo: add link to upstream issue
+matrix_mautrix_discord_bridge_restricted_rooms: "{{ false if matrix_homeserver_implementation == 'conduit' else true }}"
+
 ######################################################################
 #
 # /matrix-bridge-mautrix-discord
diff --git a/roles/matrix-bridge-mautrix-discord/defaults/main.yml b/roles/matrix-bridge-mautrix-discord/defaults/main.yml
index 0cc18052..d3eae38a 100644
--- a/roles/matrix-bridge-mautrix-discord/defaults/main.yml
+++ b/roles/matrix-bridge-mautrix-discord/defaults/main.yml
@@ -143,4 +143,4 @@ matrix_mautrix_discord_bridge_encryption_key_sharing_allow: "{{ matrix_mautrix_d
 
 # On conduit this option may prevent you from joining spaces created by the bridge.
 # Setting this to false fixes the issue.
-matrix_mautrix_discord_restricted_rooms: true
\ No newline at end of file
+matrix_mautrix_discord_bridge_restricted_rooms: true
\ No newline at end of file
diff --git a/roles/matrix-bridge-mautrix-discord/templates/config.yaml.j2 b/roles/matrix-bridge-mautrix-discord/templates/config.yaml.j2
index cd64f5d9..f88d0829 100644
--- a/roles/matrix-bridge-mautrix-discord/templates/config.yaml.j2
+++ b/roles/matrix-bridge-mautrix-discord/templates/config.yaml.j2
@@ -101,7 +101,7 @@ bridge:
     message_error_notices: true
     # Should the bridge use space-restricted join rules instead of invite-only for guild rooms?
     # This can avoid unnecessary invite events in guild rooms when members are synced in.
-    restricted_rooms: {{ matrix_mautrix_discord_restricted_rooms }}
+    restricted_rooms: {{ matrix_mautrix_discord_bridge_restricted_rooms }}
     # Should the bridge update the m.direct account data event when double puppeting is enabled.
     # Note that updating the m.direct event is not atomic (except with mautrix-asmux)
     # and is therefore prone to race conditions.