diff --git a/app/threads/client/components/ThreadComponent.tsx b/app/threads/client/components/ThreadComponent.tsx
index fadcd0414277..36fe0a4655e8 100644
--- a/app/threads/client/components/ThreadComponent.tsx
+++ b/app/threads/client/components/ThreadComponent.tsx
@@ -100,7 +100,7 @@ const ThreadComponent: FC<{
 	}, [dispatchToastMessage, followMessage, unfollowMessage, mid]);
 
 	const handleClose = useCallback(() => {
-		channelRoute.push(room.t === 'd' ? { rid: room._id } : { name: room.name });
+		channelRoute.push(room.t === 'd' ? { rid: room._id } : { name: room.name || room._id });
 	}, [channelRoute, room._id, room.t, room.name]);
 
 	const [viewData, setViewData] = useState(() => ({
diff --git a/client/components/Omnichannel/modals/TranscriptModal.tsx b/client/components/Omnichannel/modals/TranscriptModal.tsx
index 498b5bc7ee7b..4a5fc1be54e5 100644
--- a/client/components/Omnichannel/modals/TranscriptModal.tsx
+++ b/client/components/Omnichannel/modals/TranscriptModal.tsx
@@ -2,14 +2,14 @@ import { Field, Button, TextInput, Icon, ButtonGroup, Modal } from '@rocket.chat
 import { useAutoFocus } from '@rocket.chat/fuselage-hooks';
 import React, { FC, useCallback, useEffect, useState, useMemo } from 'react';
 
-import { IRoom } from '../../../../definition/IRoom';
+import { IOmnichannelRoom } from '../../../../definition/IRoom';
 import { useTranslation } from '../../../contexts/TranslationContext';
 import { useComponentDidUpdate } from '../../../hooks/useComponentDidUpdate';
 import { useForm } from '../../../hooks/useForm';
 
 type TranscriptModalProps = {
 	email: string;
-	room?: IRoom;
+	room: IOmnichannelRoom;
 	onRequest: (email: string, subject: string) => void;
 	onSend?: (email: string, subject: string, token: string) => void;
 	onCancel: () => void;
@@ -38,7 +38,7 @@ const TranscriptModal: FC<TranscriptModalProps> = ({
 	const { handleEmail, handleSubject } = handlers;
 	const [emailError, setEmailError] = useState('');
 	const [subjectError, setSubjectError] = useState('');
-	const { transcriptRequest } = (room as unknown) as IRoom;
+	const { transcriptRequest } = room;
 	const roomOpen = room && room.open;
 	const token = room?.v?.token;
 
diff --git a/client/views/room/Header/Omnichannel/QuickActions/QuickActions.tsx b/client/views/room/Header/Omnichannel/QuickActions/QuickActions.tsx
index 810c1b78858e..308e828f498e 100644
--- a/client/views/room/Header/Omnichannel/QuickActions/QuickActions.tsx
+++ b/client/views/room/Header/Omnichannel/QuickActions/QuickActions.tsx
@@ -15,7 +15,7 @@ import toastr from 'toastr';
 
 import { RoomManager } from '../../../../../../app/ui-utils/client';
 import { handleError } from '../../../../../../app/utils/client';
-import { IRoom } from '../../../../../../definition/IRoom';
+import { IOmnichannelRoom } from '../../../../../../definition/IRoom';
 import PlaceChatOnHoldModal from '../../../../../../ee/app/livechat-enterprise/client/components/modals/PlaceChatOnHoldModal';
 import Header from '../../../../../components/Header';
 import CloseChatModal from '../../../../../components/Omnichannel/modals/CloseChatModal';
@@ -35,7 +35,7 @@ import { QuickActionsActionConfig, QuickActionsEnum } from '../../../lib/QuickAc
 import { QuickActionsContext } from '../../../lib/QuickActions/QuickActionsContext';
 
 type QuickActionsProps = {
-	room: IRoom;
+	room: IOmnichannelRoom;
 	className?: ComponentProps<typeof Box>['className'];
 };
 
@@ -49,7 +49,7 @@ const QuickActions: FC<QuickActionsProps> = ({ room, className }) => {
 	);
 	const visibleActions = isMobile ? [] : actions.slice(0, 6);
 	const [email, setEmail] = useState('');
-	const visitorRoomId = room.v?._id;
+	const visitorRoomId = room.v._id;
 	const rid = room._id;
 	const uid = useUserId();
 
@@ -215,9 +215,9 @@ const QuickActions: FC<QuickActionsProps> = ({ room, className }) => {
 				break;
 			case QuickActionsEnum.CloseChat:
 				setModal(
-					room?.departmentId ? (
+					room.departmentId ? (
 						<CloseChatModalData
-							departmentId={room?.departmentId}
+							departmentId={room.departmentId}
 							onConfirm={handleClose}
 							onCancel={closeModal}
 						/>
diff --git a/client/views/room/Header/RoomHeader.tsx b/client/views/room/Header/RoomHeader.tsx
index 0e9f94ba63ad..ab80d5393b64 100644
--- a/client/views/room/Header/RoomHeader.tsx
+++ b/client/views/room/Header/RoomHeader.tsx
@@ -1,6 +1,6 @@
 import React, { FC } from 'react';
 
-import { IRoom } from '../../../../definition/IRoom';
+import { IOmnichannelRoom } from '../../../../definition/IRoom';
 import Header from '../../../components/Header';
 import MarkdownText from '../../../components/MarkdownText';
 import RoomAvatar from '../../../components/avatar/RoomAvatar';
@@ -13,7 +13,7 @@ import Favorite from './icons/Favorite';
 import Translate from './icons/Translate';
 
 export type RoomHeaderProps = {
-	room: IRoom;
+	room: IOmnichannelRoom;
 	topic?: string;
 	slots: {
 		start?: unknown;