diff --git a/app/lib/rocketchat.js b/app/lib/rocketchat.js
index 72a25d34..fdac2c1e 100644
--- a/app/lib/rocketchat.js
+++ b/app/lib/rocketchat.js
@@ -383,7 +383,11 @@ const RocketChat = {
 			rooms = rooms.update;
 		}
 		const data = subscriptions.map((subscription) => {
-			subscription._updatedAt = (rooms.find(room => room._id === subscription.rid) || subscription)._updatedAt;
+			const room = rooms.find(({ _id }) => _id === subscription.rid);
+			delete subscription._updatedAt;
+			if (room) {
+				subscription._updatedAt = room._updatedAt;
+			}
 			subscription._server = { id: server.server };
 			return subscription;
 		});
diff --git a/app/views/RoomView.js b/app/views/RoomView.js
index 27a39ba9..32db7582 100644
--- a/app/views/RoomView.js
+++ b/app/views/RoomView.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Text, View, StyleSheet, Button, SafeAreaView } from 'react-native';
+import { Text, View, StyleSheet, Button, SafeAreaView, Dimensions } from 'react-native';
 import { ListView } from 'realm/react-native';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
@@ -192,6 +192,7 @@ export default class RoomView extends React.Component {
 	};
 
 	render() {
+		const { height } = Dimensions.get('window');
 		return (
 			<KeyboardView contentContainerStyle={styles.container} keyboardVerticalOffset={64}>
 				{this.renderBanner()}
@@ -199,7 +200,7 @@ export default class RoomView extends React.Component {
 					<ListView
 						enableEmptySections
 						style={styles.list}
-						onEndReachedThreshold={350}
+						onEndReachedThreshold={height / 2}
 						renderFooter={this.renderHeader}
 						onEndReached={this.onEndReached}
 						dataSource={this.state.dataSource}