diff --git a/app/containers/MessageBox/EmojiKeyboard.js b/app/containers/MessageBox/EmojiKeyboard.js
index f8bc1301..8d552509 100644
--- a/app/containers/MessageBox/EmojiKeyboard.js
+++ b/app/containers/MessageBox/EmojiKeyboard.js
@@ -17,7 +17,7 @@ export default class EmojiKeyboard extends React.PureComponent {
 	constructor(props) {
 		super(props);
 		const state = store.getState();
-		this.baseUrl = state.server.server;
+		this.baseUrl = state.share.server || state.server.server;
 	}
 
 	onEmojiSelected = (emoji) => {
diff --git a/app/lib/database/index.js b/app/lib/database/index.js
index 31bf5317..37a17a3c 100644
--- a/app/lib/database/index.js
+++ b/app/lib/database/index.js
@@ -110,7 +110,9 @@ class DB {
 				Thread,
 				ThreadMessage,
 				Upload,
-				Permission
+				Permission,
+				CustomEmoji,
+				FrequentlyUsedEmoji
 			],
 			actionsEnabled: true
 		});
diff --git a/app/lib/rocketchat.js b/app/lib/rocketchat.js
index 06ff12ed..1848edfb 100644
--- a/app/lib/rocketchat.js
+++ b/app/lib/rocketchat.js
@@ -288,6 +288,8 @@ const RocketChat = {
 		const serversDB = database.servers;
 		reduxStore.dispatch(shareSelectServer(server));
 
+		RocketChat.setCustomEmojis();
+
 		// set User info
 		try {
 			const userId = await RNUserDefaults.get(`${ RocketChat.TOKEN_KEY }-${ server }`);