diff --git a/apps/meteor/client/views/admin/ABAC/ABACSettingTab/__snapshots__/SettingToggle.spec.tsx.snap b/apps/meteor/client/views/admin/ABAC/ABACSettingTab/__snapshots__/SettingToggle.spec.tsx.snap
index 7c48a94fb6800..78b091fbbf32f 100644
--- a/apps/meteor/client/views/admin/ABAC/ABACSettingTab/__snapshots__/SettingToggle.spec.tsx.snap
+++ b/apps/meteor/client/views/admin/ABAC/ABACSettingTab/__snapshots__/SettingToggle.spec.tsx.snap
@@ -31,7 +31,6 @@ exports[`AbacEnabledToggle should be disabled when abac license is not installed
                 <input
                   checked=""
                   class="rcx-box rcx-box--full rcx-toggle-switch__input"
-                  data-qa-setting-id="ABAC_Enabled"
                   disabled=""
                   id="ABAC_Enabled"
                   type="checkbox"
@@ -82,7 +81,6 @@ exports[`AbacEnabledToggle should render the setting toggle when setting exists
             >
               <button
                 class="rcx-box rcx-box--full rcx-button--small-square rcx-button--icon-danger rcx-button--square rcx-button--icon rcx-button rcx-css-1rtu0k9"
-                data-qa-reset-setting-id="ABAC_Enabled"
                 title="Reset"
                 type="button"
               >
@@ -99,7 +97,6 @@ exports[`AbacEnabledToggle should render the setting toggle when setting exists
                 <input
                   checked=""
                   class="rcx-box rcx-box--full rcx-toggle-switch__input"
-                  data-qa-setting-id="ABAC_Enabled"
                   id="ABAC_Enabled"
                   type="checkbox"
                 />
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/ActionSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/ActionSettingInput.tsx
index 53a0ac53df419..2ecfb77084a27 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/ActionSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/ActionSettingInput.tsx
@@ -13,7 +13,7 @@ type ActionSettingInputProps = SettingInputProps & {
 	sectionChanged: boolean;
 };
 
-function ActionSettingInput({ _id, actionText, value, hint, disabled, sectionChanged }: ActionSettingInputProps): ReactElement {
+function ActionSettingInput({ actionText, value, hint, disabled, sectionChanged }: ActionSettingInputProps): ReactElement {
 	const { t } = useTranslation();
 
 	const dispatchToastMessage = useToastMessageDispatch();
@@ -33,7 +33,7 @@ function ActionSettingInput({ _id, actionText, value, hint, disabled, sectionCha
 	return (
 		<>
 			<FieldRow>
-				<Button data-qa-setting-id={_id} disabled={disabled || sectionChanged} primary onClick={handleClick}>
+				<Button disabled={disabled || sectionChanged} primary onClick={handleClick}>
 					{t(actionText)}
 				</Button>
 			</FieldRow>
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/BooleanSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/BooleanSettingInput.tsx
index 624150b1709b6..367a8efe5aff7 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/BooleanSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/BooleanSettingInput.tsx
@@ -30,14 +30,8 @@ function BooleanSettingInput({
 					{label}
 				</FieldLabel>
 				<Box display='flex' alignItems='center'>
-					{hasResetButton && <ResetSettingButton mie={8} data-qa-reset-setting-id={_id} onClick={onResetButtonClick} />}
-					<ToggleSwitch
-						data-qa-setting-id={_id}
-						id={_id}
-						checked={value === true}
-						disabled={disabled || readonly}
-						onChange={handleChange}
-					/>
+					{hasResetButton && <ResetSettingButton mie={8} onClick={onResetButtonClick} />}
+					<ToggleSwitch id={_id} checked={value === true} disabled={disabled || readonly} onChange={handleChange} />
 				</Box>
 			</FieldRow>
 			{hint && <FieldHint>{hint}</FieldHint>}
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/CodeSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/CodeSettingInput.tsx
index 4302ad165000e..bed4565cf80aa 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/CodeSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/CodeSettingInput.tsx
@@ -38,12 +38,11 @@ function CodeSettingInput({
 				<FieldLabel htmlFor={_id} title={_id} required={required}>
 					{label}
 				</FieldLabel>
-				{hasResetButton && <ResetSettingButton data-qa-reset-setting-id={_id} onClick={onResetButtonClick} />}
+				{hasResetButton && <ResetSettingButton onClick={onResetButtonClick} />}
 			</FieldRow>
 			{hint && <FieldHint>{hint}</FieldHint>}
 			<CodeMirrorBox label={label}>
 				<CodeMirror
-					data-qa-setting-id={_id}
 					id={_id}
 					mode={code}
 					value={value}
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/ColorSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/ColorSettingInput.tsx
index 6cdc22a33ad17..ff2c4e0b63d3d 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/ColorSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/ColorSettingInput.tsx
@@ -53,7 +53,7 @@ function ColorSettingInput({
 				<FieldLabel htmlFor={_id} title={_id} required={required}>
 					{label}
 				</FieldLabel>
-				{hasResetButton && <ResetSettingButton data-qa-reset-setting-id={_id} onClick={onResetButtonClick} />}
+				{hasResetButton && <ResetSettingButton onClick={onResetButtonClick} />}
 			</FieldRow>
 			<Margins inline={4}>
 				<FieldRow>
@@ -61,7 +61,6 @@ function ColorSettingInput({
 						<Flex.Item grow={2}>
 							{editor === 'color' && (
 								<InputBox
-									data-qa-setting-id={_id}
 									type='color'
 									id={_id}
 									value={value}
@@ -74,7 +73,6 @@ function ColorSettingInput({
 							)}
 							{editor === 'expression' && (
 								<TextInput
-									data-qa-setting-id={_id}
 									id={_id}
 									value={value}
 									placeholder={placeholder}
@@ -86,7 +84,6 @@ function ColorSettingInput({
 							)}
 						</Flex.Item>
 						<Select
-							data-qa-setting-id={`${_id}_editor`}
 							type='color'
 							id={`${_id}_editor`}
 							value={editor}
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/FontSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/FontSettingInput.tsx
index 7863bc59852fb..eadb36247e370 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/FontSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/FontSettingInput.tsx
@@ -32,11 +32,10 @@ function FontSettingInput({
 				<FieldLabel htmlFor={_id} title={_id} required={required}>
 					{label}
 				</FieldLabel>
-				{hasResetButton && <ResetSettingButton data-qa-reset-setting-id={_id} onClick={onResetButtonClick} />}
+				{hasResetButton && <ResetSettingButton onClick={onResetButtonClick} />}
 			</FieldRow>
 			<FieldRow>
 				<TextInput
-					data-qa-setting-id={_id}
 					id={_id}
 					value={value}
 					placeholder={placeholder}
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/GenericSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/GenericSettingInput.tsx
index b6f2fca1ea634..2b773900239de 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/GenericSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/GenericSettingInput.tsx
@@ -32,11 +32,10 @@ function GenericSettingInput({
 				<FieldLabel htmlFor={_id} title={_id} required={required}>
 					{label}
 				</FieldLabel>
-				{hasResetButton && <ResetSettingButton data-qa-reset-setting-id={_id} onClick={onResetButtonClick} />}
+				{hasResetButton && <ResetSettingButton onClick={onResetButtonClick} />}
 			</FieldRow>
 			<FieldRow>
 				<TextInput
-					data-qa-setting-id={_id}
 					id={_id}
 					value={value}
 					placeholder={placeholder}
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/IntSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/IntSettingInput.tsx
index 49f09f0b97f19..acde6b2f72399 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/IntSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/IntSettingInput.tsx
@@ -32,11 +32,10 @@ function IntSettingInput({
 				<FieldLabel htmlFor={_id} title={_id} required={required}>
 					{label}
 				</FieldLabel>
-				{hasResetButton && <ResetSettingButton data-qa-reset-setting-id={_id} onClick={onResetButtonClick} />}
+				{hasResetButton && <ResetSettingButton onClick={onResetButtonClick} />}
 			</FieldRow>
 			<FieldRow>
 				<InputBox
-					data-qa-setting-id={_id}
 					id={_id}
 					type='number'
 					value={value}
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/LanguageSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/LanguageSettingInput.tsx
index ad0d5a72ba50c..634e83e91a557 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/LanguageSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/LanguageSettingInput.tsx
@@ -33,11 +33,10 @@ function LanguageSettingInput({
 				<FieldLabel htmlFor={_id} title={_id} required={required}>
 					{label}
 				</FieldLabel>
-				{hasResetButton && <ResetSettingButton data-qa-reset-setting-id={_id} onClick={onResetButtonClick} />}
+				{hasResetButton && <ResetSettingButton onClick={onResetButtonClick} />}
 			</FieldRow>
 			<FieldRow>
 				<Select
-					data-qa-setting-id={_id}
 					id={_id}
 					value={value}
 					placeholder={placeholder}
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/LookupSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/LookupSettingInput.tsx
index 5395f28d3634c..8dee0642607ca 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/LookupSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/LookupSettingInput.tsx
@@ -46,11 +46,10 @@ function LookupSettingInput({
 				<FieldLabel htmlFor={_id} title={_id} required={required}>
 					{label}
 				</FieldLabel>
-				{hasResetButton && <ResetSettingButton data-qa-reset-setting-id={_id} onClick={onResetButtonClick} />}
+				{hasResetButton && <ResetSettingButton onClick={onResetButtonClick} />}
 			</FieldRow>
 			<FieldRow>
 				<Select
-					data-qa-setting-id={_id}
 					id={_id}
 					value={value}
 					placeholder={placeholder}
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/MultiSelectSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/MultiSelectSettingInput.tsx
index d16dee10c07bf..8b32553027ea4 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/MultiSelectSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/MultiSelectSettingInput.tsx
@@ -39,12 +39,11 @@ function MultiSelectSettingInput({
 				<FieldLabel htmlFor={_id} title={_id} required={required}>
 					{label}
 				</FieldLabel>
-				{hasResetButton && <ResetSettingButton data-qa-reset-setting-id={_id} onClick={onResetButtonClick} />}
+				{hasResetButton && <ResetSettingButton onClick={onResetButtonClick} />}
 			</FieldRow>
 			<FieldRow>
 				<Component
 					max-width='full'
-					data-qa-setting-id={_id}
 					id={_id}
 					value={value}
 					placeholder={placeholder}
@@ -53,6 +52,7 @@ function MultiSelectSettingInput({
 					// autoComplete={autocomplete === false ? 'off' : undefined}
 					onChange={handleChange}
 					options={values.map(({ key, i18nLabel }) => [key, t(i18nLabel)])}
+					aria-label={_id} // FIXME: Multiselect (fuselage) should be associating the FieldLabel automatically. This is a workaround for accessibility and test locators.
 				/>
 			</FieldRow>
 			{hint && <FieldHint>{hint}</FieldHint>}
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/PasswordSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/PasswordSettingInput.tsx
index 70e9d69cefed1..41be622361672 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/PasswordSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/PasswordSettingInput.tsx
@@ -30,11 +30,10 @@ function PasswordSettingInput({
 				<FieldLabel htmlFor={_id} title={_id} required={required}>
 					{label}
 				</FieldLabel>
-				{hasResetButton && <ResetSettingButton data-qa-reset-setting-id={_id} onClick={onResetButtonClick} />}
+				{hasResetButton && <ResetSettingButton onClick={onResetButtonClick} />}
 			</FieldRow>
 			<FieldRow>
 				<PasswordInput
-					data-qa-setting-id={_id}
 					id={_id}
 					value={value}
 					placeholder={placeholder}
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/RangeSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/RangeSettingInput.tsx
index 4cf81057049d5..1cc286a917558 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/RangeSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/RangeSettingInput.tsx
@@ -30,7 +30,7 @@ function RangeSettingInput({
 				<FieldLabel htmlFor={_id} title={_id} required={required}>
 					{label}
 				</FieldLabel>
-				{hasResetButton && <ResetSettingButton data-qa-reset-setting-id={_id} onClick={onResetButtonClick} />}
+				{hasResetButton && <ResetSettingButton onClick={onResetButtonClick} />}
 			</FieldRow>
 			{hint && (
 				<FieldRow>
@@ -39,7 +39,6 @@ function RangeSettingInput({
 			)}
 			<FieldRow>
 				<Slider
-					data-qa-setting-id={_id}
 					disabled={disabled || readonly}
 					minValue={minValue}
 					maxValue={maxValue}
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/RelativeUrlSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/RelativeUrlSettingInput.tsx
index d4f5666ab8ee1..c56c50ad2d9d2 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/RelativeUrlSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/RelativeUrlSettingInput.tsx
@@ -33,10 +33,9 @@ function RelativeUrlSettingInput({
 				<FieldLabel htmlFor={_id} title={_id} required={required}>
 					{label}
 				</FieldLabel>
-				{hasResetButton && <ResetSettingButton data-qa-reset-setting-id={_id} onClick={onResetButtonClick} />}
+				{hasResetButton && <ResetSettingButton onClick={onResetButtonClick} />}
 			</FieldRow>
 			<UrlInput
-				data-qa-setting-id={_id}
 				id={_id}
 				value={getAbsoluteUrl(value || '')}
 				placeholder={placeholder}
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/RoomPickSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/RoomPickSettingInput.tsx
index e61e12483943a..6d8d7e7e4e13d 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/RoomPickSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/RoomPickSettingInput.tsx
@@ -36,7 +36,7 @@ function RoomPickSettingInput({
 				<FieldLabel htmlFor={_id} title={_id} required={required}>
 					{label}
 				</FieldLabel>
-				{hasResetButton && <ResetSettingButton data-qa-reset-setting-id={_id} onClick={onResetButtonClick} />}
+				{hasResetButton && <ResetSettingButton onClick={onResetButtonClick} />}
 			</FieldRow>
 			<FieldRow>
 				<RoomAutoCompleteMultiple
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/SelectSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/SelectSettingInput.tsx
index cbd456ea25f08..6fe42897a161a 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/SelectSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/SelectSettingInput.tsx
@@ -37,11 +37,10 @@ function SelectSettingInput({
 				<FieldLabel htmlFor={_id} title={_id} required={required}>
 					{label}
 				</FieldLabel>
-				{hasResetButton && <ResetSettingButton data-qa-reset-setting-id={_id} onClick={onResetButtonClick} />}
+				{hasResetButton && <ResetSettingButton onClick={onResetButtonClick} />}
 			</FieldRow>
 			<FieldRow>
 				<Select
-					data-qa-setting-id={_id}
 					id={_id}
 					value={value}
 					placeholder={placeholder}
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/SelectTimezoneSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/SelectTimezoneSettingInput.tsx
index 8da5da22d51a5..f0b74595999c4 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/SelectTimezoneSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/SelectTimezoneSettingInput.tsx
@@ -31,11 +31,10 @@ function SelectTimezoneSettingInput({
 				<FieldLabel htmlFor={_id} title={_id} required={required}>
 					{label}
 				</FieldLabel>
-				{hasResetButton && <ResetSettingButton data-qa-reset-setting-id={_id} onClick={onResetButtonClick} />}
+				{hasResetButton && <ResetSettingButton onClick={onResetButtonClick} />}
 			</FieldRow>
 			<FieldRow>
 				<Select
-					data-qa-setting-id={_id}
 					id={_id}
 					value={value}
 					placeholder={placeholder}
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/StringSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/StringSettingInput.tsx
index b1dcb1be74ba3..3d524784237e0 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/StringSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/StringSettingInput.tsx
@@ -37,12 +37,11 @@ function StringSettingInput({
 				<FieldLabel htmlFor={_id} title={_id} required={required}>
 					{label}
 				</FieldLabel>
-				{hasResetButton && <ResetSettingButton data-qa-reset-setting-id={_id} onClick={onResetButtonClick} />}
+				{hasResetButton && <ResetSettingButton onClick={onResetButtonClick} />}
 			</FieldRow>
 			<FieldRow>
 				{multiline ? (
 					<TextAreaInput
-						data-qa-setting-id={_id}
 						id={_id}
 						name={name}
 						rows={4}
@@ -56,7 +55,6 @@ function StringSettingInput({
 					/>
 				) : (
 					<TextInput
-						data-qa-setting-id={_id}
 						id={_id}
 						value={value}
 						name={name}
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/TimespanSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/TimespanSettingInput.tsx
index 18d8f62611ca6..c81b9dfdff97e 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/TimespanSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/TimespanSettingInput.tsx
@@ -88,11 +88,10 @@ function TimespanSettingInput({
 				<FieldLabel htmlFor={_id} title={_id} required={required}>
 					{label}
 				</FieldLabel>
-				{hasResetButton && <ResetSettingButton data-qa-reset-setting-id={_id} onClick={handleResetButtonClick} />}
+				{hasResetButton && <ResetSettingButton onClick={handleResetButtonClick} />}
 			</FieldRow>
 			<FieldRow>
 				<InputBox
-					data-qa-setting-id={_id}
 					id={_id}
 					type='number'
 					value={internalValue}
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/__snapshots__/RangeSettingInput.spec.tsx.snap b/apps/meteor/client/views/admin/settings/Setting/inputs/__snapshots__/RangeSettingInput.spec.tsx.snap
index 3ba94a3d26ec2..27a32bcb542a1 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/__snapshots__/RangeSettingInput.spec.tsx.snap
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/__snapshots__/RangeSettingInput.spec.tsx.snap
@@ -264,7 +264,6 @@ exports[`renders WithResetButton without crashing 1`] = `
           </label>
           <button
             class="rcx-box rcx-box--full rcx-button--small-square rcx-button--icon-danger rcx-button--square rcx-button--icon rcx-button"
-            data-qa-reset-setting-id="setting_id"
             title="Reset"
             type="button"
           >
diff --git a/apps/meteor/tests/e2e/page-objects/admin-settings.ts b/apps/meteor/tests/e2e/page-objects/admin-settings.ts
index 2c6e3e6d2f765..7750666129d39 100644
--- a/apps/meteor/tests/e2e/page-objects/admin-settings.ts
+++ b/apps/meteor/tests/e2e/page-objects/admin-settings.ts
@@ -12,7 +12,7 @@ export class AdminSettings extends Admin {
 	}
 
 	get inputSiteURL(): Locator {
-		return this.page.locator('[data-qa-setting-id="Site_Url"]');
+		return this.page.getByRole('textbox', { name: 'Site URL' });
 	}
 
 	get btnResetSiteURL(): Locator {
diff --git a/apps/meteor/tests/e2e/page-objects/omnichannel-settings.ts b/apps/meteor/tests/e2e/page-objects/omnichannel-settings.ts
index c853fb43a1018..952959fda2cac 100644
--- a/apps/meteor/tests/e2e/page-objects/omnichannel-settings.ts
+++ b/apps/meteor/tests/e2e/page-objects/omnichannel-settings.ts
@@ -28,7 +28,7 @@ export class OmnichannelSettings {
 	}
 
 	get labelHideWatermark(): Locator {
-		return this.page.locator('label', { has: this.page.locator('[data-qa-setting-id="Livechat_hide_watermark"]') });
+		return this.page.locator('label').getByText('Hide "powered by Rocket.Chat"');
 	}
 
 	get btnSave(): Locator {
diff --git a/apps/meteor/tests/e2e/settings-persistence-on-ui-navigation.spec.ts b/apps/meteor/tests/e2e/settings-persistence-on-ui-navigation.spec.ts
index a3b1daebcd49c..741a9159bd83a 100644
--- a/apps/meteor/tests/e2e/settings-persistence-on-ui-navigation.spec.ts
+++ b/apps/meteor/tests/e2e/settings-persistence-on-ui-navigation.spec.ts
@@ -26,7 +26,8 @@ test.describe.serial('settings-persistence-on-ui-navigation', () => {
 	test.afterAll(({ api }) => setSettingValueById(api, 'Hide_System_Messages', []));
 
 	test.skip('expect settings to persist in ui when navigating back and forth', async ({ page }) => {
-		const settingInput = page.locator('[data-qa-setting-id="Hide_System_Messages"] input');
+		const settingInput = page.getByLabel('Hide_System_Messages').getByRole('textbox');
+
 		await settingInput.pressSequentially('User joined');
 		await settingInput.press('Enter');
 
@@ -34,13 +35,13 @@ test.describe.serial('settings-persistence-on-ui-navigation', () => {
 			(response) => response.url().includes('/api/v1/method.call/saveSettings') && response.status() === 200,
 		);
 
-		await page.locator('button:has-text("Save changes")').click();
-		await page.locator('button[title="Back"]').click();
+		await page.getByRole('button', { name: 'Save changes' }).click();
+		await page.getByRole('button', { name: 'Back' }).click();
 
 		await responsePromise;
 
 		await page.locator('a[href="/admin/settings/Message"] >> text=Open').click();
 
-		await expect(page.locator('label[for="Hide_System_Messages"][title="Hide_System_Messages"]')).toBeVisible();
+		await expect(page.getByLabel('Hide_System_Messages').getByRole('option', { name: 'User joined' })).toBeVisible();
 	});
 });