diff --git a/CHANGES b/CHANGES
index 4938f0136..fbeec13cc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -16,6 +16,10 @@ TRUNK
 
 ### MUC
 
+- Component admins are no longer room owners by default. This can be reverted
+  to the old behaviour with `component_admins_as_room_owners = true`, but this
+  has known incompatibilities with some clients. Instead, use the shell or
+  ad-hoc commands to gain ownership of rooms when necessary.
 - Permissions updates:
   - Room creation restricted to local users (of the parent host) by default
     - restrict_room_creation = true restricts to admins, false disables all restrictions
diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index 7244ecbe2..1dc99f071 100644
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -125,7 +125,7 @@ module:default_permissions("prosody:guest", {
 	":list-rooms";
 });
 
-if module:get_option_boolean("component_admins_as_room_owners", true) then
+if module:get_option_boolean("component_admins_as_room_owners", false) then
 	-- Monkey patch to make server admins room owners
 	local _get_affiliation = room_mt.get_affiliation;
 	function room_mt:get_affiliation(jid)