diff --git a/app/navigation.js b/app/navigation.js
index dec315ab8..d465d6092 100644
--- a/app/navigation.js
+++ b/app/navigation.js
@@ -8,14 +8,10 @@ import RoomsListView from './views/roomsList';
 import RoomView from './views/room';
 import CreateChannel from './views/CreateChannel';
 
-const position = Platform.OS === 'ios' ? 'headerLeft' : 'headerRight';
 
 const MainCardNavigator = StackNavigator({
 	Rooms: {
-		screen: RoomsListView,
-		navigationOptions: ({ navigation }) => ({
-			[position]: <Button title='Servers' onPress={() => navigation.navigate('ListServerModal')} />
-		})
+		screen: RoomsListView
 	},
 	Room: {
 		screen: RoomView
diff --git a/app/views/room.js b/app/views/room.js
index 78eca59b9..18d6bf223 100644
--- a/app/views/room.js
+++ b/app/views/room.js
@@ -51,7 +51,7 @@ export default class RoomView extends React.Component {
 		// this.rid = 'GENERAL';
 
 		this.state = {
-			dataSource: this.getMessages(),
+			dataSource: [],
 			loaded: true,
 			joined: typeof props.navigation.state.params.rid === 'undefined'
 		};
@@ -69,11 +69,17 @@ export default class RoomView extends React.Component {
 				loaded: true
 			});
 		});
-		realm.addListener('change', this.updateState);
+
+		this.data = realm.objects('messages').filtered('_server.id = $0 AND rid = $1', RocketChat.currentServer, this.rid).sorted('ts', true);
+
+		this.setState({
+			dataSource: this.data
+		});
+		this.data.addListener(this.updateState);
 	}
 
 	componentWillUnmount() {
-		realm.removeListener('change', this.updateState);
+		this.data.removeListener(this.updateState);
 	}
 
 	onEndReached = () => {
@@ -92,12 +98,9 @@ export default class RoomView extends React.Component {
 		}
 	}
 
-	getMessages = () => realm.objects('messages').filtered('_server.id = $0 AND rid = $1', RocketChat.currentServer, this.rid).sorted('ts', true)
-
-	updateState = () => {
+	updateState = (data) => {
 		this.setState({
-			...this.state,
-			dataSource: this.getMessages()
+			dataSource: data
 		});
 	};
 
diff --git a/app/views/roomsList.js b/app/views/roomsList.js
index 07af52140..6690c8d6d 100644
--- a/app/views/roomsList.js
+++ b/app/views/roomsList.js
@@ -2,7 +2,7 @@ import ActionButton from 'react-native-action-button';
 import Icon from 'react-native-vector-icons/Ionicons';
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Text, View, FlatList, StyleSheet, TouchableOpacity, Platform, TextInput } from 'react-native';
+import { Button, Text, View, FlatList, StyleSheet, TouchableOpacity, Platform, TextInput } from 'react-native';
 import Meteor from 'react-native-meteor';
 import realm from '../lib/realm';
 import RocketChat from '../lib/rocketchat';
@@ -57,6 +57,7 @@ const styles = StyleSheet.create({
 });
 
 let navigation;
+let setInitialData;
 
 Meteor.getData().on('loggingIn', () => {
 	setTimeout(() => {
@@ -76,16 +77,19 @@ export default class RoomsListView extends React.Component {
 		navigation: PropTypes.object.isRequired
 	}
 
-	static navigationOptions = () => {
+	static navigationOptions = (props) => {
 		const server = RocketChat.currentServer ? RocketChat.currentServer.replace(/^https?:\/\//, '') : '';
 		const textAlign = Platform.OS === 'ios' ? 'center' : 'left';
 		const marginLeft = Platform.OS === 'ios' ? 0 : 20;
+		const position = Platform.OS === 'ios' ? 'headerLeft' : 'headerRight';
+
 		return {
 			headerTitle: <View style={{ height: 10, width: 200, top: -10, marginLeft }}>
 				<Text style={{ textAlign, fontSize: 16, fontWeight: '600' }}>Channels</Text>
 				<Text style={{ textAlign, fontSize: 10 }}>{server}</Text>
 			</View>,
-			title: 'Channels'
+			title: 'Channels',
+			[position]: <Button title='Servers' onPress={() => props.navigation.navigate('ListServerModal', { onSelect: setInitialData })} />
 		};
 	}
 
@@ -93,7 +97,7 @@ export default class RoomsListView extends React.Component {
 		super(props);
 
 		this.state = {
-			dataSource: this.getSubscriptions(),
+			dataSource: [],
 			searching: false,
 			searchDataSource: [],
 			searchText: ''
@@ -101,19 +105,23 @@ export default class RoomsListView extends React.Component {
 	}
 
 	componentWillMount() {
-		realm.addListener('change', this.updateState);
+		setInitialData = this.setInitialData;
 
 		navigation = this.props.navigation;
 
 		if (RocketChat.currentServer) {
+			this.setInitialData();
+
 			RocketChat.connect();
 		} else {
-			navigation.navigate('ListServerModal');
+			navigation.navigate('ListServerModal', {
+				onSelect: this.setInitialData
+			});
 		}
 	}
 
 	componentWillUnmount() {
-		realm.removeListener('change', this.updateState);
+		this.data.removeListener(this.updateState);
 	}
 
 	onSearchChangeText = (text) => {
@@ -161,8 +169,22 @@ export default class RoomsListView extends React.Component {
 		}
 	}
 
-	getSubscriptions = () => realm.objects('subscriptions').filtered('_server.id = $0', RocketChat.currentServer).sorted('name').slice()
-		.sort((a, b) => {
+	setInitialData = () => {
+		if (this.data) {
+			this.data.removeListener(this.updateState);
+		}
+
+		this.data = realm.objects('subscriptions').filtered('_server.id = $0', RocketChat.currentServer).sorted('name');
+
+		this.data.addListener(this.updateState);
+
+		this.setState({
+			dataSource: this.sort(this.data)
+		});
+	}
+
+	sort = (data) => {
+		return data.slice().sort((a, b) => {
 			if (a.unread < b.unread) {
 				return 1;
 			}
@@ -173,10 +195,11 @@ export default class RoomsListView extends React.Component {
 
 			return 0;
 		});
+	}
 
-	updateState = () => {
+	updateState = (data) => {
 		this.setState({
-			dataSource: this.getSubscriptions()
+			dataSource: this.sort(data)
 		});
 	}
 
diff --git a/app/views/serverList.js b/app/views/serverList.js
index cadbd75ba..2a5fe23d7 100644
--- a/app/views/serverList.js
+++ b/app/views/serverList.js
@@ -88,6 +88,7 @@ export default class ListServerView extends React.Component {
 		RocketChat.currentServer = item.id;
 
 		RocketChat.connect();
+		this.props.navigation.state.params.onSelect();
 		this.props.navigation.dispatch({ type: 'Navigation/BACK' });
 	}