diff --git a/client/views/blocks/ModalBlock.js b/client/views/blocks/ModalBlock.js
index 7b8df3902d6d..638bfff35f2f 100644
--- a/client/views/blocks/ModalBlock.js
+++ b/client/views/blocks/ModalBlock.js
@@ -2,7 +2,6 @@ import { UIKitIncomingInteractionContainerType } from '@rocket.chat/apps-engine/
 import { Modal, AnimatedVisibility, ButtonGroup, Button, Box } from '@rocket.chat/fuselage';
 import { useMutableCallback, useUniqueId } from '@rocket.chat/fuselage-hooks';
 import { kitContext, UiKitComponent, UiKitModal, modalParser } from '@rocket.chat/fuselage-ui-kit';
-import { uiKitText } from '@rocket.chat/ui-kit';
 import React, { useCallback, useEffect, useMemo, useReducer, useRef, useState } from 'react';
 
 import { renderMessageBody } from '../../lib/renderMessageBody';
@@ -10,18 +9,10 @@ import { getURL } from '../../../app/utils/lib/getURL';
 import * as ActionManager from '../../../app/ui-message/client/ActionManager';
 
 // TODO: move this to fuselage-ui-kit itself
-modalParser.text = ({ text, type } = {}) => {
-	if (type !== 'mrkdwn') {
-		return text;
-	}
+modalParser.plainText = ({ text } = {}) => text;
 
-	return <span dangerouslySetInnerHTML={{ __html: renderMessageBody({ msg: text }) }} />;
-};
-
-const textParser = uiKitText({
-	plain_text: ({ text }) => text,
-	text: ({ text }) => text,
-});
+// TODO: move this to fuselage-ui-kit itself
+modalParser.mrkdwn = ({ text }) => <span dangerouslySetInnerHTML={{ __html: renderMessageBody({ msg: text }) }} />;
 
 const focusableElementsString = `
 	a[href]:not([tabindex="-1"]),
@@ -150,7 +141,7 @@ export function ModalBlock({
 			<Modal open id={id} ref={ref}>
 				<Modal.Header>
 					{view.showIcon ? <Modal.Thumb url={getURL(`/api/apps/${ appId }/icon`)} /> : null}
-					<Modal.Title>{textParser([view.title])}</Modal.Title>
+					<Modal.Title>{modalParser.text(view.title)}</Modal.Title>
 					<Modal.Close tabIndex={-1} onClick={onClose} />
 				</Modal.Header>
 				<Modal.Content>
@@ -165,8 +156,8 @@ export function ModalBlock({
 				</Modal.Content>
 				<Modal.Footer>
 					<ButtonGroup align='end'>
-						{view.close && <Button onClick={onCancel}>{textParser([view.close.text])}</Button>}
-						{view.submit && <Button primary onClick={onSubmit}>{textParser([view.submit.text])}</Button>}
+						{view.close && <Button onClick={onCancel}>{modalParser.text(view.close.text)}</Button>}
+						{view.submit && <Button primary onClick={onSubmit}>{modalParser.text(view.submit.text)}</Button>}
 					</ButtonGroup>
 				</Modal.Footer>
 			</Modal>
diff --git a/package-lock.json b/package-lock.json
index 281c1d343b9b..e5e553d359f8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20130,7 +20130,7 @@
 				},
 				"minimist": {
 					"version": "0.0.8",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+					"resolved": false,
 					"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
 					"dev": true,
 					"optional": true
@@ -20158,7 +20158,7 @@
 				},
 				"mkdirp": {
 					"version": "0.5.1",
-					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+					"resolved": false,
 					"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
 					"dev": true,
 					"optional": true,
@@ -20331,7 +20331,7 @@
 					"dependencies": {
 						"minimist": {
 							"version": "1.2.0",
-							"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+							"resolved": false,
 							"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
 							"dev": true,
 							"optional": true