diff --git a/.changeset/afraid-boxes-destroy.md b/.changeset/afraid-boxes-destroy.md
new file mode 100644
index 0000000000000..c18d0ac6e4658
--- /dev/null
+++ b/.changeset/afraid-boxes-destroy.md
@@ -0,0 +1,6 @@
+---
+"@rocket.chat/meteor": patch
+"@rocket.chat/core-typings": patch
+---
+
+Fixes an issue in `Admin > Settings` page where sometimes settings guarded by a license module would not be editable despite having the required modules.
diff --git a/apps/meteor/server/services/federation/infrastructure/rocket-chat/adapters/Settings.ts b/apps/meteor/server/services/federation/infrastructure/rocket-chat/adapters/Settings.ts
index 3bbb803efcccd..d9708982c1c87 100644
--- a/apps/meteor/server/services/federation/infrastructure/rocket-chat/adapters/Settings.ts
+++ b/apps/meteor/server/services/federation/infrastructure/rocket-chat/adapters/Settings.ts
@@ -295,6 +295,7 @@ export class RocketChatSettingsAdapter {
 			i18nLabel: 'Federation_Matrix_max_size_of_public_rooms_users',
 			i18nDescription: 'Federation_Matrix_max_size_of_public_rooms_users_desc',
 			alert: 'Federation_Matrix_max_size_of_public_rooms_users_Alert',
+			modules: ['federation'],
 			public: true,
 			enterprise: true,
 			invalidValue: false,
diff --git a/apps/meteor/server/settings/layout.ts b/apps/meteor/server/settings/layout.ts
index 984c11b21a0ea..d869e7fcceec1 100644
--- a/apps/meteor/server/settings/layout.ts
+++ b/apps/meteor/server/settings/layout.ts
@@ -89,6 +89,7 @@ export const createLayoutSettings = () =>
 				invalidValue: false,
 				enterprise: true,
 				public: true,
+				modules: ['hide-watermark'],
 				enableQuery: [
 					{
 						_id: 'Layout_Home_Body',