diff --git a/apps/meteor/client/views/room/components/body/composer/messageBox/MessageBoxActionsToolbar/MessageBoxActionsToolbar.tsx b/apps/meteor/client/views/room/components/body/composer/messageBox/MessageBoxActionsToolbar/MessageBoxActionsToolbar.tsx
index 772b4fd38b1f..c4a0888b33f9 100644
--- a/apps/meteor/client/views/room/components/body/composer/messageBox/MessageBoxActionsToolbar/MessageBoxActionsToolbar.tsx
+++ b/apps/meteor/client/views/room/components/body/composer/messageBox/MessageBoxActionsToolbar/MessageBoxActionsToolbar.tsx
@@ -26,9 +26,9 @@ const MessageBoxActionsToolbar = ({
 	canJoin,
 }: MessageBoxActionsToolbarProps) => {
 	const actions = [
-		<VideoMessageAction key='video' collapsed={variant === 'small'} isRecording={isRecording} canSend={canJoin || canSend} />,
+		<VideoMessageAction key='video' collapsed={variant === 'small'} disabled={(!canJoin && !canSend) || typing || isRecording} />,
 		<AudioMessageAction key='audio' disabled={(!canJoin && !canSend) || typing || isRecording} />,
-		<FileUploadAction key='file' collapsed={variant === 'small'} isRecording={isRecording} canSend={canSend} />,
+		<FileUploadAction key='file' collapsed={variant === 'small'} disabled={!canSend || isRecording} />,
 	];
 
 	let featuredAction;
diff --git a/apps/meteor/client/views/room/components/body/composer/messageBox/MessageBoxActionsToolbar/actions/FileUploadAction.tsx b/apps/meteor/client/views/room/components/body/composer/messageBox/MessageBoxActionsToolbar/actions/FileUploadAction.tsx
index 89e0d07850a5..80b3c0cf44aa 100644
--- a/apps/meteor/client/views/room/components/body/composer/messageBox/MessageBoxActionsToolbar/actions/FileUploadAction.tsx
+++ b/apps/meteor/client/views/room/components/body/composer/messageBox/MessageBoxActionsToolbar/actions/FileUploadAction.tsx
@@ -1,7 +1,7 @@
 import { Option, OptionContent, OptionIcon } from '@rocket.chat/fuselage';
 import { MessageComposerAction } from '@rocket.chat/ui-composer';
 import { useTranslation, useSetting } from '@rocket.chat/ui-contexts';
-import type { ChangeEvent } from 'react';
+import type { ChangeEvent, AllHTMLAttributes } from 'react';
 import React, { useRef } from 'react';
 
 import type { ChatAPI } from '../../../../../../../../lib/chats/ChatAPI';
@@ -9,12 +9,10 @@ import { useChat } from '../../../../../../contexts/ChatContext';
 
 type FileUploadActionProps = {
 	collapsed?: boolean;
-	isRecording: boolean;
-	canSend: boolean;
 	chatContext?: ChatAPI; // TODO: remove this when the composer is migrated to React
-};
+} & Omit<AllHTMLAttributes<HTMLButtonElement>, 'is'>;
 
-const FileUploadAction = ({ collapsed, chatContext, isRecording, canSend }: FileUploadActionProps) => {
+const FileUploadAction = ({ collapsed, chatContext, disabled, ...props }: FileUploadActionProps) => {
 	const t = useTranslation();
 	const fileUploadEnabled = useSetting('FileUpload_Enabled');
 	const fileInputRef = useRef<HTMLInputElement>(null);
@@ -45,8 +43,8 @@ const FileUploadAction = ({ collapsed, chatContext, isRecording, canSend }: File
 		return (
 			<>
 				<Option
-					{...((!fileUploadEnabled || isRecording) && { title: t('Not_Available') })}
-					disabled={!fileUploadEnabled || isRecording}
+					{...((!fileUploadEnabled || disabled) && { title: t('Not_Available') })}
+					disabled={!fileUploadEnabled || disabled}
 					onClick={handleUpload}
 				>
 					<OptionIcon name='clip' />
@@ -62,9 +60,10 @@ const FileUploadAction = ({ collapsed, chatContext, isRecording, canSend }: File
 			<MessageComposerAction
 				data-qa-id='file-upload'
 				icon='clip'
-				disabled={!fileUploadEnabled || isRecording || !canSend}
+				disabled={!fileUploadEnabled || disabled}
 				onClick={handleUpload}
 				title={t('File')}
+				{...props}
 			/>
 			<input ref={fileInputRef} type='file' onChange={handleUploadChange} multiple style={{ display: 'none' }} />
 		</>
diff --git a/apps/meteor/client/views/room/components/body/composer/messageBox/MessageBoxActionsToolbar/actions/VideoMessageAction.tsx b/apps/meteor/client/views/room/components/body/composer/messageBox/MessageBoxActionsToolbar/actions/VideoMessageAction.tsx
index e2544e10dbb0..0ee5750b5cd9 100644
--- a/apps/meteor/client/views/room/components/body/composer/messageBox/MessageBoxActionsToolbar/actions/VideoMessageAction.tsx
+++ b/apps/meteor/client/views/room/components/body/composer/messageBox/MessageBoxActionsToolbar/actions/VideoMessageAction.tsx
@@ -1,6 +1,7 @@
 import { Option, OptionIcon, OptionContent } from '@rocket.chat/fuselage';
 import { MessageComposerAction } from '@rocket.chat/ui-composer';
 import { useTranslation, useSetting } from '@rocket.chat/ui-contexts';
+import type { AllHTMLAttributes } from 'react';
 import React from 'react';
 
 import type { ChatAPI } from '../../../../../../../../lib/chats/ChatAPI';
@@ -8,12 +9,10 @@ import { useChat } from '../../../../../../contexts/ChatContext';
 
 type VideoMessageActionProps = {
 	collapsed?: boolean;
-	isRecording: boolean;
-	canSend: boolean;
 	chatContext?: ChatAPI; // TODO: remove this when the composer is migrated to React
-};
+} & Omit<AllHTMLAttributes<HTMLButtonElement>, 'is'>;
 
-const VideoMessageAction = ({ collapsed, chatContext, isRecording, canSend }: VideoMessageActionProps) => {
+const VideoMessageAction = ({ collapsed, chatContext, disabled, ...props }: VideoMessageActionProps) => {
 	const t = useTranslation();
 	const fileUploadEnabled = useSetting('FileUpload_Enabled');
 	const messageVideoRecorderEnabled = useSetting('Message_VideoRecorderEnabled');
@@ -44,8 +43,8 @@ const VideoMessageAction = ({ collapsed, chatContext, isRecording, canSend }: Vi
 	if (collapsed) {
 		return (
 			<Option
-				{...((!enableVideoMessage || isRecording) && { title: t('Not_Available') })}
-				disabled={!enableVideoMessage || isRecording}
+				{...((!enableVideoMessage || disabled) && { title: t('Not_Available') })}
+				disabled={!enableVideoMessage || disabled}
 				onClick={handleOpenVideoMessage}
 			>
 				<OptionIcon name='video' />
@@ -58,9 +57,10 @@ const VideoMessageAction = ({ collapsed, chatContext, isRecording, canSend }: Vi
 		<MessageComposerAction
 			data-qa-id='video-message'
 			icon='video'
-			disabled={!enableVideoMessage || isRecording || !canSend}
+			disabled={!enableVideoMessage || disabled}
 			onClick={handleOpenVideoMessage}
 			title={t('Video_message')}
+			{...props}
 		/>
 	);
 };