diff --git a/apps/meteor/client/views/admin/settings/MemoizedSetting.tsx b/apps/meteor/client/views/admin/settings/MemoizedSetting.tsx
index 535051e3aa808..c543fee27689d 100644
--- a/apps/meteor/client/views/admin/settings/MemoizedSetting.tsx
+++ b/apps/meteor/client/views/admin/settings/MemoizedSetting.tsx
@@ -87,13 +87,14 @@ const MemoizedSetting = ({
 		<Field className={className}>
 			<InputComponent
 				value={value}
+				hint={hint}
 				editor={editor}
 				onChangeValue={onChangeValue}
 				onChangeEditor={onChangeEditor}
 				{...inputProps}
 				disabled={disabled}
 			/>
-			{hint && <Field.Hint>{hint}</Field.Hint>}
+			{hint && type !== 'code' && <Field.Hint>{hint}</Field.Hint>}
 			{callout && (
 				<Margins block='x16'>
 					<Callout type='warning'>{callout}</Callout>
diff --git a/apps/meteor/client/views/admin/settings/inputs/CodeSettingInput.stories.tsx b/apps/meteor/client/views/admin/settings/inputs/CodeSettingInput.stories.tsx
index e81e319853592..e4e1fcf35edae 100644
--- a/apps/meteor/client/views/admin/settings/inputs/CodeSettingInput.stories.tsx
+++ b/apps/meteor/client/views/admin/settings/inputs/CodeSettingInput.stories.tsx
@@ -48,6 +48,15 @@ WithValue.args = {
 	placeholder: 'Placeholder',
 };
 
+export const WithDescription = Template.bind({});
+WithDescription.args = {
+	_id: 'setting_id',
+	label: 'Label',
+	hint: 'Description: Lorem ipsum dolor sit amet, consectetur adipiscing elit.',
+	value: 'console.log("Hello World!");',
+	placeholder: 'Placeholder',
+};
+
 export const WithResetButton = Template.bind({});
 WithResetButton.args = {
 	_id: 'setting_id',
diff --git a/apps/meteor/client/views/admin/settings/inputs/CodeSettingInput.tsx b/apps/meteor/client/views/admin/settings/inputs/CodeSettingInput.tsx
index 153d807bab7da..c1df28c9a1b49 100644
--- a/apps/meteor/client/views/admin/settings/inputs/CodeSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/inputs/CodeSettingInput.tsx
@@ -10,6 +10,7 @@ import CodeMirror from './CodeMirror';
 type CodeSettingInputProps = {
 	_id: string;
 	label: string;
+	hint: string;
 	value?: string;
 	code: string;
 	placeholder?: string;
@@ -24,6 +25,7 @@ type CodeSettingInputProps = {
 function CodeSettingInput({
 	_id,
 	label,
+	hint,
 	value = '',
 	code,
 	placeholder,
@@ -51,6 +53,7 @@ function CodeSettingInput({
 					</Field.Label>
 					{hasResetButton && <ResetSettingButton data-qa-reset-setting-id={_id} onClick={onResetButtonClick} />}
 				</Box>
+				{hint && <Field.Hint>{hint}</Field.Hint>}
 			</Flex.Container>
 			<div className={['code-mirror-box', fullScreen && 'code-mirror-box-fullscreen content-background-color'].filter(Boolean).join(' ')}>
 				<div className='title'>{label}</div>