diff --git a/src/app/organisms/room/RoomTimeline.tsx b/src/app/organisms/room/RoomTimeline.tsx
index 483356d..22fba03 100644
--- a/src/app/organisms/room/RoomTimeline.tsx
+++ b/src/app/organisms/room/RoomTimeline.tsx
@@ -1139,13 +1139,17 @@ export function RoomTimeline({ room, eventId, roomInputRef, editor }: RoomTimeli
         return null;
       }
 
-      const height = scaleYDimension(videoInfo.w || 400, 400, videoInfo.h || 400);
+      // FIXME
+      const videoW = videoInfo?.w ?? 400;
+      const videoH = videoInfo?.h ?? 400;
+      const maxW = scrollRef.current?.querySelector(`[data-message-id]>div>div:nth-child(2)`)?.clientWidth ?? 400;
+      const height = videoW <= maxW ? videoH : scaleYDimension(videoW, maxW, videoH);
 
       return (
         <Attachment>
           <AttachmentBox
             style={{
-              height: toRem(height < 48 ? 48 : height),
+              height: toRem(Math.max(48, Math.min(480, height))),
             }}
           >
             <VideoContent
diff --git a/src/app/organisms/room/message/VideoContent.tsx b/src/app/organisms/room/message/VideoContent.tsx
index 8b3bd34..32b7e34 100644
--- a/src/app/organisms/room/message/VideoContent.tsx
+++ b/src/app/organisms/room/message/VideoContent.tsx
@@ -116,7 +116,7 @@ export const VideoContent = as<'div', VideoContentProps>(
           </Box>
         )}
         {srcState.status === AsyncStatus.Success && (
-          <Box className={css.AbsoluteContainer}>
+          <Box className={css.AbsoluteContainer} style={{position: 'unset'}}>
             <Video
               title={body}
               src={srcState.data}