diff --git a/app/lib/rocketchat.js b/app/lib/rocketchat.js
index 188178a8f..781ed2112 100644
--- a/app/lib/rocketchat.js
+++ b/app/lib/rocketchat.js
@@ -432,13 +432,10 @@ const RocketChat = {
 			}
 			return subscription;
 		});
-		
+
 		database.write(() => {
 			data.forEach(subscription =>
 				database.create('subscriptions', subscription, true));
-		});
-
-		database.write(() => {
 			rooms.forEach(room => 
 				database.create('rooms', room, true));
 		});
diff --git a/app/views/RoomsListView/index.js b/app/views/RoomsListView/index.js
index c1d63f6ec..69f39d004 100644
--- a/app/views/RoomsListView/index.js
+++ b/app/views/RoomsListView/index.js
@@ -81,7 +81,7 @@ export default class RoomsListView extends React.Component {
 	}
 
 	getLastMessage = (subscription) => {
-		const room = database.objects('rooms').sorted('_updatedAt', true).slice().find(({ _id }) => _id === subscription.rid);
+		const [ room ] = database.objects('rooms').filtered('_id = $0', subscription.rid).slice();
 		console.log('ROOM', room);
 		return room.lastMessage;
 	}