diff --git a/.changeset/fix-thread-empty-space.md b/.changeset/fix-thread-empty-space.md
new file mode 100644
index 00000000..fffeeaa5
--- /dev/null
+++ b/.changeset/fix-thread-empty-space.md
@@ -0,0 +1,5 @@
+---
+default: patch
+---
+
+Fix excessive whitespace between the thread root message and replies in the thread drawer
diff --git a/src/app/features/room/ThreadDrawer.tsx b/src/app/features/room/ThreadDrawer.tsx
index 31af1897..fd7075bf 100644
--- a/src/app/features/room/ThreadDrawer.tsx
+++ b/src/app/features/room/ThreadDrawer.tsx
@@ -719,6 +719,7 @@ export function ThreadDrawer({ room, threadRootId, onClose, overlay }: ThreadDra
           hideTrack={false}
           style={{
             maxHeight: '200px',
+            height: 'fit-content',
             flexShrink: 0,
           }}
         >
@@ -726,7 +727,7 @@ export function ThreadDrawer({ room, threadRootId, onClose, overlay }: ThreadDra
             className={css.messageList}
             direction="Column"
             style={{
-              padding: `${config.space.S600} 0`,
+              padding: `${config.space.S400} 0 ${config.space.S200} 0`,
             }}
           >
             <ThreadMessage {...sharedMessageProps} mEvent={rootEvent} />
@@ -772,7 +773,7 @@ export function ThreadDrawer({ room, threadRootId, onClose, overlay }: ThreadDra
               <Box
                 className={css.messageList}
                 direction="Column"
-                style={{ padding: `${config.space.S600} 0` }}
+                style={{ padding: `0 0 ${config.space.S600} 0` }}
               >
                 {replyEvents.map((mEvent, i) => {
                   const prevEvent = i > 0 ? replyEvents[i - 1] : undefined;