diff --git a/app/views/RoomView/List/index.tsx b/app/views/RoomView/List/index.tsx
index 2369c6ff7..c9ac05ca6 100644
--- a/app/views/RoomView/List/index.tsx
+++ b/app/views/RoomView/List/index.tsx
@@ -10,7 +10,7 @@ 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 } from '../../../lib/methods/helpers/layoutAnimation';
+// import { animateNextTransition } from '../../../lib/methods/helpers/layoutAnimation';
 import log from '../../../lib/methods/helpers/log';
 import EmptyRoom from '../EmptyRoom';
 // @ts-ignore
@@ -110,7 +110,7 @@ class ListContainer extends React.Component<IListContainerProps, IListContainerS
 			this.unsubscribeFocus();
 		}
 		this.clearHighlightedMessageTimeout();
-		console.countReset(`${this.constructor.name}.render calls`);
+		console.countReset(`${this.constructor.name}.render: ${this.props.tmid || this.props.rid} calls`);
 	}
 
 	// clears previous highlighted message timeout, if exists
@@ -123,7 +123,7 @@ class ListContainer extends React.Component<IListContainerProps, IListContainerS
 
 	query = async () => {
 		this.count += QUERY_SIZE;
-		const { rid, tmid, showMessageInMainThread, serverVersion, listRef } = this.props;
+		const { rid, tmid, showMessageInMainThread, serverVersion } = this.props;
 		const db = database.active;
 
 		// handle servers with version < 3.0.0
@@ -185,10 +185,10 @@ class ListContainer extends React.Component<IListContainerProps, IListContainerS
 
 				if (this.mounted) {
 					this.setState({ messages: data });
-					if (this.animated) {
-						listRef.current?.prepareForLayoutAnimationRender();
-						animateNextTransition();
-					}
+					// if (this.animated) {
+					// 	listRef.current?.prepareForLayoutAnimationRender();
+					// 	animateNextTransition();
+					// }
 				} else {
 					// @ts-ignore
 					this.state.messages = data;
@@ -337,9 +337,9 @@ class ListContainer extends React.Component<IListContainerProps, IListContainerS
 	};
 
 	render() {
-		console.count(`${this.constructor.name}.render calls`);
 		const { rid, tmid, listRef, loading } = this.props;
 		const { messages, refreshing, highlightedMessage } = this.state;
+		console.count(`${this.constructor.name}.render: ${tmid || rid} calls`);
 		return (
 			// FIXME: added context directly so we don't have to touch on withTheme's ref
 			<ThemeContext.Consumer>
diff --git a/app/views/RoomView/index.tsx b/app/views/RoomView/index.tsx
index fa5d1be9e..5d1b43e7b 100644
--- a/app/views/RoomView/index.tsx
+++ b/app/views/RoomView/index.tsx
@@ -487,7 +487,7 @@ class RoomView extends React.Component<IRoomViewProps, IRoomViewState> {
 			EventEmitter.removeListener(KEY_COMMAND, this.handleCommands);
 		}
 		EventEmitter.removeListener('ROOM_REMOVED', this.handleRoomRemoved);
-		console.countReset(`${this.constructor.name}.render calls`);
+		console.countReset(`${this.constructor.name}.render: ${this.tmid || room.rid} calls`);
 	}
 
 	canForwardGuest = async () => {
@@ -1526,10 +1526,10 @@ class RoomView extends React.Component<IRoomViewProps, IRoomViewState> {
 	};
 
 	render() {
-		console.count(`${this.constructor.name}.render calls`);
 		const { room, loading } = this.state;
 		const { user, baseUrl, theme, navigation, Hide_System_Messages, width, serverVersion } = this.props;
 		const { rid, t } = room;
+		console.count(`${this.constructor.name}.render: ${this.tmid || rid} calls`);
 		let sysMes;
 		let bannerClosed;
 		let announcement;