diff --git a/app/containers/MessageBox/EmojiKeyboard.tsx b/app/containers/MessageBox/EmojiKeyboard.tsx
index 2919ec2df..2286e994f 100644
--- a/app/containers/MessageBox/EmojiKeyboard.tsx
+++ b/app/containers/MessageBox/EmojiKeyboard.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { View } from 'react-native';
-import { Keyboard } from 'react-native-ui-lib';
+import { KeyboardRegistry } from 'react-native-ui-lib/keyboard';
 import { Provider } from 'react-redux';
 
 import store from '../../lib/store';
@@ -13,7 +13,7 @@ import { colors } from '../../lib/constants';
 
 const EmojiKeyboard = ({ theme }: { theme: TSupportedThemes }) => {
 	const onItemClicked = (eventType: EventTypes, emoji?: IEmoji) => {
-		Keyboard.KeyboardRegistry.onItemSelected('EmojiKeyboard', { eventType, emoji });
+		KeyboardRegistry.onItemSelected('EmojiKeyboard', { eventType, emoji });
 	};
 
 	return (
@@ -35,4 +35,4 @@ const EmojiKeyboard = ({ theme }: { theme: TSupportedThemes }) => {
 	);
 };
 
-Keyboard.KeyboardRegistry.registerKeyboard('EmojiKeyboard', () => EmojiKeyboard);
+KeyboardRegistry.registerKeyboard('EmojiKeyboard', () => EmojiKeyboard);
diff --git a/app/containers/MessageBox/index.tsx b/app/containers/MessageBox/index.tsx
index 32b0fdf95..e6721d854 100644
--- a/app/containers/MessageBox/index.tsx
+++ b/app/containers/MessageBox/index.tsx
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import { Alert, Keyboard, NativeModules, Text, View, BackHandler } from 'react-native';
 import { connect } from 'react-redux';
-import { KeyboardAccessoryView } from 'react-native-ui-lib';
+import { KeyboardAccessoryView } from 'react-native-ui-lib/keyboard';
 import ImagePicker, { Image, ImageOrVideo, Options } from 'react-native-image-crop-picker';
 import { dequal } from 'dequal';
 import DocumentPicker from 'react-native-document-picker';
diff --git a/app/externalModules.d.ts b/app/externalModules.d.ts
index c825f6bb4..872c516e1 100644
--- a/app/externalModules.d.ts
+++ b/app/externalModules.d.ts
@@ -3,7 +3,6 @@ declare module 'commonmark';
 declare module 'commonmark-react-renderer';
 declare module 'remove-markdown';
 declare module 'react-native-image-progress';
-declare module 'react-native-ui-lib/keyboard';
 declare module '@rocket.chat/sdk';
 declare module 'react-native-config-reader';
 declare module 'react-native-keycommands';
diff --git a/package.json b/package.json
index d6a773819..0886bc88a 100644
--- a/package.json
+++ b/package.json
@@ -123,7 +123,7 @@
 		"react-native-skeleton-placeholder": "^5.2.3",
 		"react-native-slowlog": "^1.0.2",
 		"react-native-svg": "^12.3.0",
-		"react-native-ui-lib": "RocketChat/react-native-ui-lib#new.build-rocket-chat",
+		"react-native-ui-lib": "RocketChat/react-native-ui-lib#19a93de50c89e5b8370c5bd35e1ed114c45ebf13",
 		"react-native-vector-icons": "9.1.0",
 		"react-native-webview": "10.3.2",
 		"react-redux": "^8.0.5",
diff --git a/yarn.lock b/yarn.lock
index f3f2dedb5..e6b4ab424 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -17502,9 +17502,9 @@ react-native-text-size@4.0.0-rc.1:
   resolved "https://registry.yarnpkg.com/react-native-text-size/-/react-native-text-size-4.0.0-rc.1.tgz#1e048d345dd6a5a8e1269e0585c1a5948c478da5"
   integrity sha512-CysqjU2jK6Yc+a+kEI222pUyTY2ywcU2HqbFqf1KHymW6OPTdvBBHqbEJKL0QiLhQaFYDbqicM+h990s9TP00g==
 
-react-native-ui-lib@RocketChat/react-native-ui-lib#new.build-rocket-chat:
+react-native-ui-lib@RocketChat/react-native-ui-lib#19a93de50c89e5b8370c5bd35e1ed114c45ebf13:
   version "7.0.0"
-  resolved "https://codeload.github.com/RocketChat/react-native-ui-lib/tar.gz/5039b784028581159beef3a91be7f6ff3b9ca6c1"
+  resolved "https://codeload.github.com/RocketChat/react-native-ui-lib/tar.gz/19a93de50c89e5b8370c5bd35e1ed114c45ebf13"
   dependencies:
     babel-plugin-transform-inline-environment-variables "^0.0.2"
     color "^3.1.0"