diff --git a/apps/meteor/client/views/admin/customSounds/AdminSoundsRoute.tsx b/apps/meteor/client/views/admin/customSounds/AdminSoundsRoute.tsx
index 4b6a70e2c4a..03441862c98 100644
--- a/apps/meteor/client/views/admin/customSounds/AdminSoundsRoute.tsx
+++ b/apps/meteor/client/views/admin/customSounds/AdminSoundsRoute.tsx
@@ -125,7 +125,7 @@ function CustomSoundsRoute(): ReactElement {
 												small
 												square
 												aria-label={t('Play')}
-												onClick={(e) => {
+												onClick={(e): void => {
 													e.preventDefault();
 													e.stopPropagation();
 													handlePlay(sound._id);
diff --git a/apps/meteor/client/views/admin/mailer/Mailer.tsx b/apps/meteor/client/views/admin/mailer/Mailer.tsx
index 2b800826b7d..2d55e0ef7af 100644
--- a/apps/meteor/client/views/admin/mailer/Mailer.tsx
+++ b/apps/meteor/client/views/admin/mailer/Mailer.tsx
@@ -1,5 +1,5 @@
 import { TextInput, TextAreaInput, Field, FieldGroup, CheckBox, Button, Icon, ButtonGroup } from '@rocket.chat/fuselage';
-import React, { useState, useCallback, SyntheticEvent } from 'react';
+import React, { useState, useCallback, SyntheticEvent, ReactElement } from 'react';
 
 import { validateEmail } from '../../../../lib/emailValidator';
 import { isJSON } from '../../../../lib/utils/isJSON';
@@ -11,7 +11,7 @@ type MailerProps = {
 	sendMail: ({ fromEmail, subject, emailBody, dryRun, query }: sendMailObject) => void;
 };
 
-export function Mailer({ sendMail }: MailerProps) {
+export function Mailer({ sendMail }: MailerProps): ReactElement {
 	const t = useTranslation();
 
 	const [fromEmail, setFromEmail] = useState<{ value: string; error?: string }>({ value: '' });
@@ -26,7 +26,7 @@ export function Mailer({ sendMail }: MailerProps) {
 				<ButtonGroup align='end'>
 					<Button
 						primary
-						onClick={() => {
+						onClick={(): void => {
 							sendMail({ fromEmail, dryRun, query, subject, emailBody });
 						}}
 					>
@@ -45,7 +45,7 @@ export function Mailer({ sendMail }: MailerProps) {
 								placeholder={t('Type_your_email')}
 								value={fromEmail.value}
 								error={fromEmail.error}
-								onChange={(e: SyntheticEvent<HTMLInputElement>) => {
+								onChange={(e: SyntheticEvent<HTMLInputElement>): void => {
 									setFromEmail({
 										value: e.currentTarget.value,
 										error: !validateEmail(e.currentTarget.value) ? t('Invalid_email') : undefined,
@@ -56,7 +56,7 @@ export function Mailer({ sendMail }: MailerProps) {
 					</Field>
 					<Field>
 						<Field.Row>
-							<CheckBox id='dryRun' checked={dryRun} onChange={() => setDryRun(!dryRun)} />
+							<CheckBox id='dryRun' checked={dryRun} onChange={(): void => setDryRun(!dryRun)} />
 							<Field.Label htmlFor='dry-run'>{t('Dry_run')}</Field.Label>
 						</Field.Row>
 						<Field.Hint>{t('Dry_run_description')}</Field.Hint>
@@ -68,7 +68,7 @@ export function Mailer({ sendMail }: MailerProps) {
 								id='query'
 								value={query.value}
 								error={query.error}
-								onChange={(e: SyntheticEvent<HTMLInputElement>) => {
+								onChange={(e: SyntheticEvent<HTMLInputElement>): void => {
 									setQuery({
 										value: e.currentTarget.value,
 										error: e.currentTarget.value && !isJSON(e.currentTarget.value) ? t('Invalid_JSON') : undefined,
@@ -84,7 +84,7 @@ export function Mailer({ sendMail }: MailerProps) {
 							<TextInput
 								id='subject'
 								value={subject}
-								onChange={(e: SyntheticEvent<HTMLInputElement>) => {
+								onChange={(e: SyntheticEvent<HTMLInputElement>): void => {
 									setSubject(e.currentTarget.value);
 								}}
 							/>
@@ -97,7 +97,7 @@ export function Mailer({ sendMail }: MailerProps) {
 								id='emailBody'
 								rows={10}
 								value={emailBody}
-								onChange={(e: SyntheticEvent<HTMLInputElement>) => setEmailBody(e.currentTarget.value)}
+								onChange={(e: SyntheticEvent<HTMLInputElement>): void => setEmailBody(e.currentTarget.value)}
 							/>
 						</Field.Row>
 						<Field.Hint dangerouslySetInnerHTML={{ __html: t('Mailer_body_tags') }} />
diff --git a/apps/meteor/client/views/admin/mailer/MailerRoute.tsx b/apps/meteor/client/views/admin/mailer/MailerRoute.tsx
index 3236fb25798..e24b53d3bea 100644
--- a/apps/meteor/client/views/admin/mailer/MailerRoute.tsx
+++ b/apps/meteor/client/views/admin/mailer/MailerRoute.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { ReactElement } from 'react';
 
 import { usePermission } from '../../../contexts/AuthorizationContext';
 import { useMethod } from '../../../contexts/ServerContext';
@@ -22,7 +22,7 @@ const useSendMail: useSendMailType = () => {
 	const t = useTranslation();
 	const dispatchToastMessage = useToastMessageDispatch();
 
-	return ({ fromEmail, subject, emailBody, dryRun, query }) => {
+	return ({ fromEmail, subject, emailBody, dryRun, query }): void => {
 		if (query.error) {
 			dispatchToastMessage({
 				type: 'error',
@@ -53,7 +53,7 @@ const useSendMail: useSendMailType = () => {
 	};
 };
 
-export default function MailerRoute() {
+export default function MailerRoute(): ReactElement {
 	const canAccessMailer = usePermission('access-mailer');
 	const sendMail = useSendMail();
 
diff --git a/apps/meteor/client/views/room/contextualBar/ExportMessages/MailExportForm.tsx b/apps/meteor/client/views/room/contextualBar/ExportMessages/MailExportForm.tsx
index 85c3a5aa825..5609ee7892f 100644
--- a/apps/meteor/client/views/room/contextualBar/ExportMessages/MailExportForm.tsx
+++ b/apps/meteor/client/views/room/contextualBar/ExportMessages/MailExportForm.tsx
@@ -79,11 +79,11 @@ const MailExportForm: FC<MailExportFormProps> = ({ onCancel, rid }) => {
 
 		$('.messages-box .message', $root).on('click', handler);
 
-		return () => {
+		return (): void => {
 			$('.messages-box', $root).removeClass('selectable');
 			$('.messages-box .message', $root).off('click', handler).filter('.selected').removeClass('selected');
 		};
-	}, [rid, messageList]);
+	}, [rid, messageList, selectedMessageStore]);
 
 	const { handleToUsers, handleAdditionalEmails, handleSubject } = handlers;