diff --git a/apps/meteor/server/settings/troubleshoot.ts b/apps/meteor/server/settings/troubleshoot.ts
index c86097855c31f..d06eb901e44b9 100644
--- a/apps/meteor/server/settings/troubleshoot.ts
+++ b/apps/meteor/server/settings/troubleshoot.ts
@@ -42,23 +42,6 @@ export const createTroubleshootSettings = () =>
 			i18nDescription: 'Troubleshoot_Disable_Teams_Mention_Alert',
 		});
 
-		// TODO: remove this setting at next major (7.0.0)
-		await this.add('Troubleshoot_Disable_Statistics_Generator', false, {
-			type: 'boolean',
-			i18nDescription: 'Troubleshoot_Disable_Statistics_Generator_Alert',
-			private: true,
-			hidden: true,
-			readonly: true,
-		});
-		// TODO: remove this setting at next major (7.0.0)
-		await this.add('Troubleshoot_Disable_Workspace_Sync', false, {
-			type: 'boolean',
-			i18nDescription: 'Troubleshoot_Disable_Workspace_Sync_Alert',
-			private: true,
-			hidden: true,
-			readonly: true,
-		});
-
 		await this.add('Troubleshoot_Force_Caching_Version', '', {
 			type: 'string',
 			i18nDescription: 'Troubleshoot_Force_Caching_Version_Alert',
diff --git a/apps/meteor/server/startup/migrations/index.ts b/apps/meteor/server/startup/migrations/index.ts
index 84ce15e460cd7..349074132e846 100644
--- a/apps/meteor/server/startup/migrations/index.ts
+++ b/apps/meteor/server/startup/migrations/index.ts
@@ -44,5 +44,6 @@ import './v335';
 import './v336';
 import './v337';
 import './v338';
+import './v339';
 
 export * from './xrun';
diff --git a/apps/meteor/server/startup/migrations/v339.ts b/apps/meteor/server/startup/migrations/v339.ts
new file mode 100644
index 0000000000000..a9469306e5f08
--- /dev/null
+++ b/apps/meteor/server/startup/migrations/v339.ts
@@ -0,0 +1,11 @@
+import { Settings } from '@rocket.chat/models';
+
+import { addMigration } from '../../lib/migrations';
+
+addMigration({
+	version: 339,
+	name: 'Remove Troubleshoot_Disable_Statistics_Generator and Troubleshoot_Disable_Workspace_Sync settings',
+	async up() {
+		await Settings.deleteMany({ _id: { $in: ['Troubleshoot_Disable_Statistics_Generator', 'Troubleshoot_Disable_Workspace_Sync'] } });
+	},
+});