diff --git a/app/soapbox/features/status/components/thread.tsx b/app/soapbox/features/status/components/thread.tsx
index e50ee8615..9a9e5fe8c 100644
--- a/app/soapbox/features/status/components/thread.tsx
+++ b/app/soapbox/features/status/components/thread.tsx
@@ -122,6 +122,9 @@ const Thread = (props: IThread) => {
     };
   });
 
+  let initialTopMostItemIndex = ancestorsIds.size;
+  if (!useWindowScroll && initialTopMostItemIndex !== 0) initialTopMostItemIndex = ancestorsIds.size + 1;
+
   const [showMedia, setShowMedia] = useState<boolean>(status?.visibility === 'self' ? false : defaultMediaVisibility(status, displayMedia));
 
   const node = useRef<HTMLDivElement>(null);
@@ -407,7 +410,7 @@ const Thread = (props: IThread) => {
 
   if (!useWindowScroll) {
     // Add padding to the top of the Thread (for Media Modal)
-    children.push(<div className='h-4' />);
+    children.push(<div key='padding' className='h-4' />);
   }
 
   if (hasAncestors) {
@@ -444,7 +447,7 @@ const Thread = (props: IThread) => {
           hasMore={!!next}
           onLoadMore={handleLoadMore}
           placeholderComponent={() => <PlaceholderStatus variant='slim' />}
-          initialTopMostItemIndex={ancestorsIds.size}
+          initialTopMostItemIndex={initialTopMostItemIndex}
           useWindowScroll={useWindowScroll}
           itemClassName={itemClassName}
           className={
diff --git a/package.json b/package.json
index 6e5bd9aea..f4e602788 100644
--- a/package.json
+++ b/package.json
@@ -163,7 +163,7 @@
     "react-sticky-box": "^2.0.0",
     "react-swipeable-views": "^0.14.0",
     "react-textarea-autosize": "^8.3.4",
-    "react-virtuoso": "^4.0.8",
+    "react-virtuoso": "^4.3.11",
     "redux": "^4.1.1",
     "redux-immutable": "^4.0.0",
     "redux-thunk": "^2.2.0",
diff --git a/yarn.lock b/yarn.lock
index 7c5985dee..4d572b473 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14866,10 +14866,10 @@ react-transition-group@^2.2.1:
     prop-types "^15.6.2"
     react-lifecycles-compat "^3.0.4"
 
-react-virtuoso@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/react-virtuoso/-/react-virtuoso-4.0.8.tgz#6543573e5b2da8cd5808bd687655cf24d7930dfe"
-  integrity sha512-ne9QzKajqwDT13t2nt5uktuFkyBTjRsJCdF06gdwcPVP6lrWt/VE5tkKf2OVtMqfethR8/FHuAYDOLyT5YtddQ==
+react-virtuoso@^4.3.11:
+  version "4.3.11"
+  resolved "https://registry.yarnpkg.com/react-virtuoso/-/react-virtuoso-4.3.11.tgz#ab24e707287ef1b4bb5b52f3b14795ba896e9768"
+  integrity sha512-0YrCvQ5GsIKRcN34GxrzhSJGuMNI+hGxWci5cTVuPQ8QWTEsrKfCyqm7YNBMmV3pu7onG1YVUBo86CyCXdejXg==
 
 react@^18.0.0:
   version "18.2.0"