diff --git a/app/views/RoomView/List/index.tsx b/app/views/RoomView/List/index.tsx
index 494ed11f2..ca2b78a29 100644
--- a/app/views/RoomView/List/index.tsx
+++ b/app/views/RoomView/List/index.tsx
@@ -9,7 +9,7 @@ import { Observable, Subscription } from 'rxjs';
 import ActivityIndicator from '../../../containers/ActivityIndicator';
 import { MessageType, TAnyMessage, TMessageModel, TThreadMessageModel, TThreadModel } from '../../../definitions';
 import database from '../../../lib/database';
-import { compareServerVersion, debounce } from '../../../lib/methods/helpers';
+import { animateNextTransition, compareServerVersion, debounce } from '../../../lib/methods/helpers';
 // import { animateNextTransition } from '../../../lib/methods/helpers/layoutAnimation';
 import log from '../../../lib/methods/helpers/log';
 import EmptyRoom from '../EmptyRoom';
@@ -123,7 +123,7 @@ class ListContainer extends React.Component<IListContainerProps, IListContainerS
 
 	query = async () => {
 		this.count += QUERY_SIZE;
-		const { rid, tmid, showMessageInMainThread, serverVersion } = this.props;
+		const { rid, tmid, showMessageInMainThread, serverVersion, listRef } = this.props;
 		const db = database.active;
 
 		// handle servers with version < 3.0.0
@@ -185,10 +185,11 @@ class ListContainer extends React.Component<IListContainerProps, IListContainerS
 
 				if (this.mounted) {
 					this.setState({ messages: data });
-					// if (this.animated) {
-					// 	listRef.current?.prepareForLayoutAnimationRender();
-					// 	animateNextTransition();
-					// }
+
+					if (this.animated && this.viewableItems?.[0].index === 0) {
+						listRef.current?.prepareForLayoutAnimationRender();
+						animateNextTransition();
+					}
 				} else {
 					// @ts-ignore
 					this.state.messages = data;