diff --git a/apps/meteor/client/components/message/MessageCollapsible.tsx b/apps/meteor/client/components/message/MessageCollapsible.tsx
index a949be34e379e..3d8ab2215a857 100644
--- a/apps/meteor/client/components/message/MessageCollapsible.tsx
+++ b/apps/meteor/client/components/message/MessageCollapsible.tsx
@@ -12,10 +12,11 @@ type MessageCollapsibleProps = {
 	link?: string;
 	size?: number;
 	isCollapsed?: boolean;
+	attachmentId? : string ; // 
 };
 
-const MessageCollapsible = ({ children, title, hasDownload, link, size, isCollapsed }: MessageCollapsibleProps): ReactElement => {
-	const [collapsed, collapse] = useCollapse(isCollapsed);
+const MessageCollapsible = ({ children, title, hasDownload, link, size, isCollapsed, attachmentId }: MessageCollapsibleProps): ReactElement => {
+	const [collapsed, collapse] = useCollapse(attachmentId,isCollapsed); // 
 
 	return (
 		<>
diff --git a/apps/meteor/client/components/message/content/attachments/file/AudioAttachment.tsx b/apps/meteor/client/components/message/content/attachments/file/AudioAttachment.tsx
index 9fa94126127e8..cd6bcb043b457 100644
--- a/apps/meteor/client/components/message/content/attachments/file/AudioAttachment.tsx
+++ b/apps/meteor/client/components/message/content/attachments/file/AudioAttachment.tsx
@@ -7,6 +7,7 @@ import { useReloadOnError } from './hooks/useReloadOnError';
 import MessageCollapsible from '../../../MessageCollapsible';
 
 const AudioAttachment = ({
+	id,
 	title,
 	audio_url: url,
 	audio_type: type,
@@ -21,7 +22,7 @@ const AudioAttachment = ({
 
 	return (
 		<>
-			<MessageCollapsible title={title} hasDownload={hasDownload} link={getURL(link || url)} size={size} isCollapsed={collapsed}>
+			<MessageCollapsible title={title} hasDownload={hasDownload} link={getURL(link || url)} size={size} isCollapsed={collapsed} attachmentId={id}>
 				<AudioPlayer src={src} type={type} ref={mediaRef} />
 			</MessageCollapsible>
 		</>
diff --git a/apps/meteor/client/components/message/content/attachments/file/GenericFileAttachment.tsx b/apps/meteor/client/components/message/content/attachments/file/GenericFileAttachment.tsx
index 2e0fb7107d983..99d86bda74339 100644
--- a/apps/meteor/client/components/message/content/attachments/file/GenericFileAttachment.tsx
+++ b/apps/meteor/client/components/message/content/attachments/file/GenericFileAttachment.tsx
@@ -21,6 +21,7 @@ const openDocumentViewer = window.RocketChatDesktop?.openDocumentViewer;
 type GenericFileAttachmentProps = MessageAttachmentBase;
 
 const GenericFileAttachment = ({
+	id,
 	title,
 	title_link: link,
 	title_link_download: hasDownload,
@@ -68,7 +69,7 @@ const GenericFileAttachment = ({
 
 	return (
 		<>
-			<MessageCollapsible title={title} hasDownload={hasDownload} link={link} isCollapsed={collapsed}>
+			<MessageCollapsible title={title} hasDownload={hasDownload} link={link} isCollapsed={collapsed} attachmentId={id}>
 				<MessageGenericPreview style={{ maxWidth: 368, width: '100%' }}>
 					<MessageGenericPreviewContent
 						thumb={<MessageGenericPreviewIcon name='attachment-file' type={format || getFileExtension(title)} />}
diff --git a/apps/meteor/client/components/message/content/attachments/file/ImageAttachment.tsx b/apps/meteor/client/components/message/content/attachments/file/ImageAttachment.tsx
index b1410b6bbf895..08ba8c32f9b43 100644
--- a/apps/meteor/client/components/message/content/attachments/file/ImageAttachment.tsx
+++ b/apps/meteor/client/components/message/content/attachments/file/ImageAttachment.tsx
@@ -25,7 +25,7 @@ const ImageAttachment = ({
 
 	return (
 		<>
-			<MessageCollapsible title={title} hasDownload={hasDownload} link={getURL(link || url)} size={size} isCollapsed={collapsed}>
+			<MessageCollapsible title={title} hasDownload={hasDownload} link={getURL(link || url)} size={size} isCollapsed={collapsed} attachmentId={id}>
 				<AttachmentImage
 					{...imageDimensions}
 					loadImage={loadImage}
diff --git a/apps/meteor/client/components/message/content/attachments/file/VideoAttachment.tsx b/apps/meteor/client/components/message/content/attachments/file/VideoAttachment.tsx
index 1fdcedb220f2d..baf93dd9698d4 100644
--- a/apps/meteor/client/components/message/content/attachments/file/VideoAttachment.tsx
+++ b/apps/meteor/client/components/message/content/attachments/file/VideoAttachment.tsx
@@ -8,6 +8,7 @@ import { userAgentMIMETypeFallback } from '../../../../../lib/utils/userAgentMIM
 import MessageCollapsible from '../../../MessageCollapsible';
 
 const VideoAttachment = ({
+	id,
 	title,
 	video_url: url,
 	video_type: type,
@@ -22,7 +23,7 @@ const VideoAttachment = ({
 
 	return (
 		<>
-			<MessageCollapsible title={title} hasDownload={hasDownload} link={getURL(link || url)} size={size} isCollapsed={collapsed}>
+			<MessageCollapsible title={title} hasDownload={hasDownload} link={getURL(link || url)} size={size} isCollapsed={collapsed} attachmentId={id}>
 				<MessageGenericPreview style={{ maxWidth: 368, width: '100%' }}>
 					<Box is='video' controls preload='metadata' ref={mediaRef}>
 						<source src={getURL(url)} type={userAgentMIMETypeFallback(type)} />
diff --git a/apps/meteor/client/components/message/content/urlPreviews/OEmbedCollapsible.tsx b/apps/meteor/client/components/message/content/urlPreviews/OEmbedCollapsible.tsx
index 12977c0545c78..07aca983a9804 100644
--- a/apps/meteor/client/components/message/content/urlPreviews/OEmbedCollapsible.tsx
+++ b/apps/meteor/client/components/message/content/urlPreviews/OEmbedCollapsible.tsx
@@ -12,7 +12,7 @@ const OEmbedCollapsible = ({ children, ...props }: OEmbedCollapsibleProps): Reac
 	const { t } = useTranslation();
 
 	return (
-		<MessageCollapsible title={t('Link_Preview')}>
+		<MessageCollapsible title={t('Link_Preview')} >
 			<MessageGenericPreview>
 				{children}
 				<OEmbedPreviewContent {...props} />
diff --git a/apps/meteor/client/components/message/hooks/useCollapse.tsx b/apps/meteor/client/components/message/hooks/useCollapse.tsx
index 25598d551e6cb..30541db2376b3 100644
--- a/apps/meteor/client/components/message/hooks/useCollapse.tsx
+++ b/apps/meteor/client/components/message/hooks/useCollapse.tsx
@@ -1,11 +1,57 @@
 import { useToggle } from '@rocket.chat/fuselage-hooks';
 import { useAttachmentIsCollapsedByDefault } from '@rocket.chat/ui-contexts';
 import type { ReactNode } from 'react';
+import  {useState,useEffect}  from 'react'
 
 import CollapsibleContent from '../content/collapsible/CollapsibleContent';
 
-export const useCollapse = (attachmentCollapsed?: boolean): [collapsed: boolean, node: ReactNode] => {
-	const collpaseByDefault = useAttachmentIsCollapsedByDefault();
-	const [collapsed, toogleCollapsed] = useToggle(collpaseByDefault || attachmentCollapsed);
+const usePersistedCollapse= (attachmentId : string | undefined , initialCollapsed: boolean)=>{
+      const  [collapsed,setCollapsed] = useState(()=>{
+		 if(attachmentId){
+               const stored=    sessionStorage.getItem(`persistant-attachment-${attachmentId}`)
+			   if(stored != null){
+				   return stored == 'true'
+
+			   }
+			}
+
+             return initialCollapsed 
+
+	  })
+
+	  const  toogleCollapsed=  ()=>{
+		setCollapsed((prev)=>{
+		    const  value = !prev
+			if(attachmentId){
+				sessionStorage.setItem(`persistant-attachment-${attachmentId}`,value ? 'true' : 'false')
+			}
+			 return value 
+	       })
+
+		}
+		
+		// Sync with state 
+		
+		useEffect(() => {
+			if (attachmentId) {
+				const stored = sessionStorage.getItem(`persistant-attachment-${attachmentId}`);
+				if (stored !== null) {
+					setCollapsed(stored === 'true');
+				}
+			}
+		}, [attachmentId]);
+		
+		return [collapsed,toogleCollapsed] as const
+
+}
+
+
+
+export const useCollapse = (attachmentId : string | undefined,attachmentCollapsed?: boolean): [collapsed: boolean, node: ReactNode] => {
+	
+	 console.log('reset state')
+	const collapseByDefault = useAttachmentIsCollapsedByDefault() 
+	const initialCollapsed = collapseByDefault || attachmentCollapsed 
+	const [collapsed, toogleCollapsed] = usePersistedCollapse(attachmentId,initialCollapsed) ||useToggle(initialCollapsed);
 	return [collapsed, <CollapsibleContent collapsed={collapsed} onClick={toogleCollapsed as any} key='collapsible-content-action' />];
 };