diff --git a/changelog.d/17661.fix b/changelog.d/17661.fix
new file mode 100644
index 0000000000..33881bbc6a
--- /dev/null
+++ b/changelog.d/17661.fix
@@ -0,0 +1 @@
+Make sure we advertise registration as disabled when MSC3861 is enabled.