diff --git a/app/views/RoomView/List/index.tsx b/app/views/RoomView/List/index.tsx
index b81baf365..0252c1012 100644
--- a/app/views/RoomView/List/index.tsx
+++ b/app/views/RoomView/List/index.tsx
@@ -348,7 +348,7 @@ class ListContainer extends React.Component<IListContainerProps, IListContainerS
 					scrollEventThrottle={16}
 					listRef={listRef}
 					data={messages}
-					extraData={loading || messages || highlightedMessage}
+					extraData={{ loading, highlightedMessage }}
 					// @ts-ignore
 					renderItem={this.renderItem}
 					onEndReached={this.onEndReached}