diff --git a/apps/meteor/client/views/room/contextualBar/Threads/Thread.tsx b/apps/meteor/client/views/room/contextualBar/Threads/Thread.tsx
index 78f6edd444426..4398c924eb36a 100644
--- a/apps/meteor/client/views/room/contextualBar/Threads/Thread.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Threads/Thread.tsx
@@ -19,7 +19,6 @@ import {
 	useUserId,
 	useRoomToolbox,
 } from '@rocket.chat/ui-contexts';
-import { createPortal } from 'react-dom';
 
 import ThreadChat from './components/ThreadChat';
 import ThreadSkeleton from './components/ThreadSkeleton';
@@ -42,6 +41,13 @@ const Thread = ({ tmid }: ThreadProps) => {
 			closeTab();
 		},
 	});
+	if (
+		mainMessageQueryResult.isSuccess &&
+		(!mainMessageQueryResult.data || mainMessageQueryResult.data.t === 'rm')
+	) {
+		closeTab();
+		return null;
+	}
 
 	const t = useTranslation();
 	const dispatchToastMessage = useToastMessageDispatch();
@@ -83,85 +89,64 @@ const Thread = ({ tmid }: ThreadProps) => {
 		closeTab();
 	};
 
-	const isExpanded = canExpand && expanded;
-	const portalTarget = isExpanded ? document.getElementById('main-content') : null;
-
-	const threadContent = (
-		<Contextualbar
-			rcx-thread-view
-			className={
-				isExpanded
-					? css`
-							max-width: 855px !important;
-							@media (min-width: 780px) and (max-width: 1135px) {
-								max-width: calc(100% - var(--sidebar-width)) !important;
-							}
-						`
-					: undefined
-			}
-			position='absolute'
-			display='flex'
-			flexDirection='column'
-			width='full'
-			overflow='hidden'
-			zIndex={100}
-			insetBlock={0}
-			border='none'
-		>
-			<ContextualbarHeader>
-				<ContextualbarBack onClick={handleGoBack} />
-				{(mainMessageQueryResult.isLoading && <Skeleton width='100%' />) ||
-					(mainMessageQueryResult.isSuccess && <ThreadTitle mainMessage={mainMessageQueryResult.data} />) ||
-					null}
-				<ContextualbarActions>
-					{canExpand && (
-						<ContextualbarAction
-							name={expanded ? 'arrow-collapse' : 'arrow-expand'}
-							title={expanded ? t('Collapse') : t('Expand')}
-							onClick={handleToggleExpand}
-						/>
-					)}
-					<ContextualbarAction
-						name={following ? 'bell' : 'bell-off'}
-						title={following ? t('Following') : t('Not_Following')}
-						disabled={!mainMessageQueryResult.isSuccess || toggleFollowingMutation.isPending}
-						onClick={handleToggleFollowing}
-					/>
-					<ContextualbarClose onClick={handleClose} />
-				</ContextualbarActions>
-			</ContextualbarHeader>
-
-			{(mainMessageQueryResult.isLoading && <ThreadSkeleton />) ||
-				(mainMessageQueryResult.isSuccess && (
-					<ChatProvider tmid={tmid}>
-						<ThreadChat mainMessage={mainMessageQueryResult.data} />
-					</ChatProvider>
-				)) ||
-				null}
-		</Contextualbar>
-	);
-
 	return (
 		<ContextualbarDialog>
 			<ContextualbarInnerContent>
-				{portalTarget ? (
-					createPortal(
-						<>
-							<ModalBackdrop
-								className={css`
-									position: absolute !important;
-								`}
-								onClick={handleBackdropClick}
-							/>
-							{threadContent}
-						</>,
-						portalTarget,
-					)
-				) : (
-					<Box flexGrow={1} position='relative'>
-						{threadContent}
-					</Box>
-				)}
+				{canExpand && expanded && <ModalBackdrop onClick={handleBackdropClick} />}
+				<Box flexGrow={1} position={expanded ? 'static' : 'relative'}>
+					<Contextualbar
+						rcx-thread-view
+						className={
+							canExpand && expanded
+								? css`
+										max-width: 855px !important;
+										@media (min-width: 780px) and (max-width: 1135px) {
+											max-width: calc(100% - var(--sidebar-width)) !important;
+										}
+									`
+								: undefined
+						}
+						position={expanded ? 'fixed' : 'absolute'}
+						display='flex'
+						flexDirection='column'
+						width='full'
+						overflow='hidden'
+						zIndex={100}
+						insetBlock={0}
+						border='none'
+					>
+						<ContextualbarHeader>
+							<ContextualbarBack onClick={handleGoBack} />
+							{(mainMessageQueryResult.isLoading && <Skeleton width='100%' />) ||
+								(mainMessageQueryResult.isSuccess && <ThreadTitle mainMessage={mainMessageQueryResult.data} />) ||
+								null}
+							<ContextualbarActions>
+								{canExpand && (
+									<ContextualbarAction
+										name={expanded ? 'arrow-collapse' : 'arrow-expand'}
+										title={expanded ? t('Collapse') : t('Expand')}
+										onClick={handleToggleExpand}
+									/>
+								)}
+								<ContextualbarAction
+									name={following ? 'bell' : 'bell-off'}
+									title={following ? t('Following') : t('Not_Following')}
+									disabled={!mainMessageQueryResult.isSuccess || toggleFollowingMutation.isPending}
+									onClick={handleToggleFollowing}
+								/>
+								<ContextualbarClose onClick={handleClose} />
+							</ContextualbarActions>
+						</ContextualbarHeader>
+
+						{(mainMessageQueryResult.isLoading && <ThreadSkeleton />) ||
+							(mainMessageQueryResult.isSuccess && (
+								<ChatProvider tmid={tmid}>
+									<ThreadChat mainMessage={mainMessageQueryResult.data} />
+								</ChatProvider>
+							)) ||
+							null}
+					</Contextualbar>
+				</Box>
 			</ContextualbarInnerContent>
 		</ContextualbarDialog>
 	);