diff --git a/apps/meteor/client/apps/gameCenter/GameCenterList.tsx b/apps/meteor/client/apps/gameCenter/GameCenterList.tsx
index 32537f75a3cd..0318ab701c50 100644
--- a/apps/meteor/client/apps/gameCenter/GameCenterList.tsx
+++ b/apps/meteor/client/apps/gameCenter/GameCenterList.tsx
@@ -24,7 +24,7 @@ const GameCenterList = ({ handleClose, handleOpenGame, games, isLoading }: IGame
 			const handleClose = (): void => {
 				setModal(null);
 			};
-			setModal(() => <GameCenterInvitePlayersModal onClose={handleClose} game={game} />);
+			setModal(<GameCenterInvitePlayersModal onClose={handleClose} game={game} />);
 		},
 		[setModal],
 	);
diff --git a/apps/meteor/client/providers/CallProvider/CallProvider.tsx b/apps/meteor/client/providers/CallProvider/CallProvider.tsx
index 6110cf217fbb..02d508e544a2 100644
--- a/apps/meteor/client/providers/CallProvider/CallProvider.tsx
+++ b/apps/meteor/client/providers/CallProvider/CallProvider.tsx
@@ -94,7 +94,7 @@ export const CallProvider = ({ children }: CallProviderProps) => {
 	);
 
 	const openWrapUpModal = useCallback((): void => {
-		setModal(() => <WrapUpCallModal closeRoom={closeRoom} />);
+		setModal(<WrapUpCallModal closeRoom={closeRoom} />);
 	}, [closeRoom, setModal]);
 
 	const changeAudioOutputDevice = useMutableCallback((selectedAudioDevice: Device): void => {
diff --git a/apps/meteor/client/sidebar/header/hooks/useCreateRoomModal.tsx b/apps/meteor/client/sidebar/header/hooks/useCreateRoomModal.tsx
index 38c858d0d6f5..a1581c404850 100644
--- a/apps/meteor/client/sidebar/header/hooks/useCreateRoomModal.tsx
+++ b/apps/meteor/client/sidebar/header/hooks/useCreateRoomModal.tsx
@@ -10,6 +10,6 @@ export const useCreateRoomModal = (Component: ElementType<{ onClose: () => void
 			setModal(null);
 		};
 
-		setModal(() => <Component onClose={handleClose} />);
+		setModal(<Component onClose={handleClose} />);
 	});
 };
diff --git a/apps/meteor/client/sidebarv2/header/hooks/useCreateRoomModal.tsx b/apps/meteor/client/sidebarv2/header/hooks/useCreateRoomModal.tsx
index a5e26cf8227b..d1af9eb35599 100644
--- a/apps/meteor/client/sidebarv2/header/hooks/useCreateRoomModal.tsx
+++ b/apps/meteor/client/sidebarv2/header/hooks/useCreateRoomModal.tsx
@@ -10,6 +10,6 @@ export const useCreateRoomModal = (Component: FC<any>): (() => void) => {
 			setModal(null);
 		};
 
-		setModal(() => <Component onClose={handleClose} />);
+		setModal(<Component onClose={handleClose} />);
 	});
 };
diff --git a/apps/meteor/client/views/account/profile/AccountProfilePage.tsx b/apps/meteor/client/views/account/profile/AccountProfilePage.tsx
index 730ff507e545..bc8a267165f7 100644
--- a/apps/meteor/client/views/account/profile/AccountProfilePage.tsx
+++ b/apps/meteor/client/views/account/profile/AccountProfilePage.tsx
@@ -76,7 +76,7 @@ const AccountProfilePage = (): ReactElement => {
 				}
 			};
 
-			return setModal(() => (
+			return setModal(
 				<ConfirmOwnerChangeModal
 					onConfirm={handleConfirm}
 					onCancel={() => setModal(null)}
@@ -84,8 +84,8 @@ const AccountProfilePage = (): ReactElement => {
 					confirmText={t('Delete')}
 					shouldChangeOwner={shouldChangeOwner}
 					shouldBeRemoved={shouldBeRemoved}
-				/>
-			));
+				/>,
+			);
 		},
 		[erasureType, setModal, t, deleteOwnAccount, dispatchToastMessage, logout],
 	);
@@ -106,7 +106,7 @@ const AccountProfilePage = (): ReactElement => {
 			}
 		};
 
-		return setModal(() => <ActionConfirmModal onConfirm={handleConfirm} onCancel={() => setModal(null)} isPassword={hasLocalPassword} />);
+		return setModal(<ActionConfirmModal onConfirm={handleConfirm} onCancel={() => setModal(null)} isPassword={hasLocalPassword} />);
 	}, [dispatchToastMessage, hasLocalPassword, setModal, handleConfirmOwnerChange, deleteOwnAccount, logout, t]);
 
 	const profileFormId = useUniqueId();
diff --git a/apps/meteor/client/views/admin/customEmoji/EditCustomEmoji.tsx b/apps/meteor/client/views/admin/customEmoji/EditCustomEmoji.tsx
index 16ac6670d5bb..431f5671aeff 100644
--- a/apps/meteor/client/views/admin/customEmoji/EditCustomEmoji.tsx
+++ b/apps/meteor/client/views/admin/customEmoji/EditCustomEmoji.tsx
@@ -115,11 +115,11 @@ const EditCustomEmoji = ({ close, onChange, data, ...props }: EditCustomEmojiPro
 			setModal(null);
 		};
 
-		setModal(() => (
+		setModal(
 			<GenericModal variant='danger' onConfirm={handleDelete} onCancel={handleCancel} onClose={handleCancel} confirmText={t('Delete')}>
 				{t('Custom_Emoji_Delete_Warning')}
-			</GenericModal>
-		));
+			</GenericModal>,
+		);
 	}, [setModal, deleteAction, _id, dispatchToastMessage, t, onChange, close]);
 
 	const handleChangeAliases = useCallback(
diff --git a/apps/meteor/client/views/admin/customSounds/EditSound.tsx b/apps/meteor/client/views/admin/customSounds/EditSound.tsx
index 2c0e82061b3d..f98ddd5ae8ff 100644
--- a/apps/meteor/client/views/admin/customSounds/EditSound.tsx
+++ b/apps/meteor/client/views/admin/customSounds/EditSound.tsx
@@ -115,11 +115,11 @@ function EditSound({ close, onChange, data, ...props }: EditSoundProps): ReactEl
 
 		const handleCancel = (): void => setModal(null);
 
-		setModal(() => (
+		setModal(
 			<GenericModal variant='danger' onConfirm={handleDelete} onCancel={handleCancel} onClose={handleCancel} confirmText={t('Delete')}>
 				{t('Custom_Sound_Delete_Warning')}
-			</GenericModal>
-		));
+			</GenericModal>,
+		);
 	}, [_id, close, deleteCustomSound, dispatchToastMessage, onChange, setModal, t]);
 
 	const [clickUpload] = useSingleFileInput(handleChangeFile, 'audio/mp3');
diff --git a/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusForm.tsx b/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusForm.tsx
index 22ad9517f338..29adabce787d 100644
--- a/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusForm.tsx
+++ b/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusForm.tsx
@@ -74,11 +74,11 @@ const CustomUserStatusForm = ({ onClose, onReload, status }: CustomUserStatusFor
 			}
 		};
 
-		setModal(() => (
+		setModal(
 			<GenericModal variant='danger' onConfirm={handleDelete} onCancel={handleCancel} onClose={handleCancel} confirmText={t('Delete')}>
 				{t('Custom_User_Status_Delete_Warning')}
-			</GenericModal>
-		));
+			</GenericModal>,
+		);
 	}, [_id, route, deleteStatus, dispatchToastMessage, onReload, setModal, t]);
 
 	const presenceOptions: SelectOption[] = [
diff --git a/apps/meteor/client/views/admin/oauthApps/EditOauthApp.tsx b/apps/meteor/client/views/admin/oauthApps/EditOauthApp.tsx
index b1b4e27d4380..d27aad6f7d7e 100644
--- a/apps/meteor/client/views/admin/oauthApps/EditOauthApp.tsx
+++ b/apps/meteor/client/views/admin/oauthApps/EditOauthApp.tsx
@@ -87,7 +87,7 @@ const EditOauthApp = ({ onChange, data, ...props }: EditOauthAppProps): ReactEle
 	}, [data._id, close, deleteApp, dispatchToastMessage, setModal, t]);
 
 	const openConfirmDelete = (): void =>
-		setModal(() => (
+		setModal(
 			<GenericModal
 				variant='danger'
 				onConfirm={onDeleteConfirm}
@@ -96,8 +96,8 @@ const EditOauthApp = ({ onChange, data, ...props }: EditOauthAppProps): ReactEle
 				confirmText={t('Delete')}
 			>
 				{t('Application_delete_warning')}
-			</GenericModal>
-		));
+			</GenericModal>,
+		);
 
 	return (
 		<ContextualbarScrollableContent w='full' {...props}>
diff --git a/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useChangeModeratorAction.tsx b/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useChangeModeratorAction.tsx
index e5c0f1d4824e..594f2800a15a 100644
--- a/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useChangeModeratorAction.tsx
+++ b/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useChangeModeratorAction.tsx
@@ -107,7 +107,7 @@ export const useChangeModeratorAction = (user: Pick<IUser, '_id' | 'username'>,
 
 			const changingOwnRole = userId === loggedUserId;
 			if (changingOwnRole && loggedUserIsModerator) {
-				return setModal(() =>
+				return setModal(
 					getWarningModalForFederatedRooms(
 						closeModal,
 						handleConfirm,
@@ -119,7 +119,7 @@ export const useChangeModeratorAction = (user: Pick<IUser, '_id' | 'username'>,
 			}
 
 			if (changingOwnRole && loggedUserIsOwner) {
-				return setModal(() =>
+				return setModal(
 					getWarningModalForFederatedRooms(
 						closeModal,
 						handleConfirm,
@@ -131,7 +131,7 @@ export const useChangeModeratorAction = (user: Pick<IUser, '_id' | 'username'>,
 			}
 
 			if (!changingOwnRole && loggedUserIsModerator) {
-				return setModal(() =>
+				return setModal(
 					getWarningModalForFederatedRooms(
 						closeModal,
 						handleConfirm,
diff --git a/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useChangeOwnerAction.tsx b/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useChangeOwnerAction.tsx
index 2206f3da263d..a247fc7d0047 100644
--- a/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useChangeOwnerAction.tsx
+++ b/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useChangeOwnerAction.tsx
@@ -106,7 +106,7 @@ export const useChangeOwnerAction = (user: Pick<IUser, '_id' | 'username'>, rid:
 		};
 
 		if (changingOwnRole && loggedUserIsOwner) {
-			return setModal(() =>
+			return setModal(
 				getWarningModalForFederatedRooms(
 					closeModal,
 					handleConfirm,
@@ -118,7 +118,7 @@ export const useChangeOwnerAction = (user: Pick<IUser, '_id' | 'username'>, rid:
 		}
 
 		if (!changingOwnRole && loggedUserIsOwner) {
-			return setModal(() =>
+			return setModal(
 				getWarningModalForFederatedRooms(
 					closeModal,
 					handleConfirm,