diff --git a/app/views/AutoTranslateView/index.js b/app/views/AutoTranslateView/index.js
index d2691632d..57a7188b8 100644
--- a/app/views/AutoTranslateView/index.js
+++ b/app/views/AutoTranslateView/index.js
@@ -127,7 +127,7 @@ export default class AutoTranslateView extends React.Component {
 	render() {
 		const { languages } = this.state;
 		return (
-			<SafeAreaView style={sharedStyles.listSafeArea} testID='auto-translate-view' forceInset={{ bottom: 'never' }}>
+			<SafeAreaView style={sharedStyles.listSafeArea} testID='auto-translate-view' forceInset={{ vertical: 'never' }}>
 				<StatusBar />
 				<ScrollView
 					{...scrollPersistTaps}
diff --git a/app/views/CreateChannelView.js b/app/views/CreateChannelView.js
index b29cedbda..0b6fbae99 100644
--- a/app/views/CreateChannelView.js
+++ b/app/views/CreateChannelView.js
@@ -333,7 +333,7 @@ export default class CreateChannelView extends React.Component {
 				keyboardVerticalOffset={128}
 			>
 				<StatusBar />
-				<SafeAreaView testID='create-channel-view' style={styles.container} forceInset={{ bottom: 'never' }}>
+				<SafeAreaView testID='create-channel-view' style={styles.container} forceInset={{ vertical: 'never' }}>
 					<ScrollView {...scrollPersistTaps}>
 						<View style={sharedStyles.separatorVertical}>
 							<TextInput
diff --git a/app/views/DirectoryView/index.js b/app/views/DirectoryView/index.js
index 55034ca08..ec0ee68f2 100644
--- a/app/views/DirectoryView/index.js
+++ b/app/views/DirectoryView/index.js
@@ -215,7 +215,7 @@ export default class DirectoryView extends React.Component {
 		} = this.state;
 		const { isFederationEnabled } = this.props;
 		return (
-			<SafeAreaView style={styles.safeAreaView} testID='directory-view' forceInset={{ bottom: 'never' }}>
+			<SafeAreaView style={styles.safeAreaView} testID='directory-view' forceInset={{ vertical: 'never' }}>
 				<StatusBar />
 				<FlatList
 					data={data}
diff --git a/app/views/ForgotPasswordView.js b/app/views/ForgotPasswordView.js
index 012e62214..123aa5e0f 100644
--- a/app/views/ForgotPasswordView.js
+++ b/app/views/ForgotPasswordView.js
@@ -96,7 +96,7 @@ export default class ForgotPasswordView extends React.Component {
 			>
 				<StatusBar />
 				<ScrollView {...scrollPersistTaps} contentContainerStyle={sharedStyles.containerScrollView}>
-					<SafeAreaView style={sharedStyles.container} testID='forgot-password-view' forceInset={{ bottom: 'never' }}>
+					<SafeAreaView style={sharedStyles.container} testID='forgot-password-view' forceInset={{ vertical: 'never' }}>
 						<Text style={[sharedStyles.loginTitle, sharedStyles.textBold]}>{I18n.t('Forgot_password')}</Text>
 						<TextInput
 							inputRef={(e) => { this.emailInput = e; }}
diff --git a/app/views/LanguageView/index.js b/app/views/LanguageView/index.js
index 5c7522fbb..9217439bd 100644
--- a/app/views/LanguageView/index.js
+++ b/app/views/LanguageView/index.js
@@ -141,7 +141,7 @@ export default class LanguageView extends React.Component {
 	render() {
 		const { saving } = this.state;
 		return (
-			<SafeAreaView style={sharedStyles.listSafeArea} testID='language-view' forceInset={{ bottom: 'never' }}>
+			<SafeAreaView style={sharedStyles.listSafeArea} testID='language-view' forceInset={{ vertical: 'never' }}>
 				<StatusBar />
 				<FlatList
 					data={LANGUAGES}
diff --git a/app/views/LegalView.js b/app/views/LegalView.js
index 74f60ba48..d424f6cbf 100644
--- a/app/views/LegalView.js
+++ b/app/views/LegalView.js
@@ -81,7 +81,7 @@ export default class LegalView extends React.Component {
 
 	render() {
 		return (
-			<SafeAreaView style={styles.container} testID='legal-view' forceInset={{ bottom: 'never' }}>
+			<SafeAreaView style={styles.container} testID='legal-view' forceInset={{ vertical: 'never' }}>
 				<StatusBar />
 				<ScrollView {...scrollPersistTaps} contentContainerStyle={styles.scroll}>
 					{this.renderItem({ text: 'Terms_of_Service', route: 'terms-of-service', testID: 'legal-terms-button' })}
diff --git a/app/views/LoginSignupView.js b/app/views/LoginSignupView.js
index 1b09b994f..6d7f7e3d8 100644
--- a/app/views/LoginSignupView.js
+++ b/app/views/LoginSignupView.js
@@ -365,7 +365,7 @@ export default class LoginSignupView extends React.Component {
 		return (
 			<ScrollView style={[sharedStyles.containerScrollView, sharedStyles.container, styles.container]} {...scrollPersistTaps}>
 				<StatusBar />
-				<SafeAreaView testID='welcome-view' forceInset={{ bottom: 'never' }} style={styles.safeArea}>
+				<SafeAreaView testID='welcome-view' forceInset={{ vertical: 'never' }} style={styles.safeArea}>
 					{this.renderServices()}
 					{this.renderServicesSeparator()}
 					<Button
diff --git a/app/views/LoginView.js b/app/views/LoginView.js
index d6ca026e0..f848bdcd9 100644
--- a/app/views/LoginView.js
+++ b/app/views/LoginView.js
@@ -194,7 +194,7 @@ export default class LoginView extends React.Component {
 	renderTOTP = () => {
 		const { isFetching } = this.props;
 		return (
-			<SafeAreaView style={sharedStyles.container} testID='login-view' forceInset={{ bottom: 'never' }}>
+			<SafeAreaView style={sharedStyles.container} testID='login-view' forceInset={{ vertical: 'never' }}>
 				<Text style={[sharedStyles.loginTitle, sharedStyles.textBold, styles.loginTitle]}>{I18n.t('Two_Factor_Authentication')}</Text>
 				<Text style={[sharedStyles.loginSubtitle, sharedStyles.textRegular]}>{I18n.t('Whats_your_2fa')}</Text>
 				<TextInput
@@ -224,7 +224,7 @@ export default class LoginView extends React.Component {
 			Accounts_EmailOrUsernamePlaceholder, Accounts_PasswordPlaceholder, isFetching
 		} = this.props;
 		return (
-			<SafeAreaView style={sharedStyles.container} testID='login-view' forceInset={{ bottom: 'never' }}>
+			<SafeAreaView style={sharedStyles.container} testID='login-view' forceInset={{ vertical: 'never' }}>
 				<Text style={[sharedStyles.loginTitle, sharedStyles.textBold]}>{I18n.t('Login')}</Text>
 				<TextInput
 					inputRef={(e) => { this.usernameInput = e; }}
diff --git a/app/views/MessagesView/index.js b/app/views/MessagesView/index.js
index 25c03d7e2..3d386c732 100644
--- a/app/views/MessagesView/index.js
+++ b/app/views/MessagesView/index.js
@@ -252,7 +252,7 @@ export default class MessagesView extends React.Component {
 		}
 
 		return (
-			<SafeAreaView style={styles.list} testID={this.content.testID} forceInset={{ bottom: 'never' }}>
+			<SafeAreaView style={styles.list} testID={this.content.testID} forceInset={{ vertical: 'never' }}>
 				<StatusBar />
 				<FlatList
 					data={messages}
diff --git a/app/views/NewMessageView.js b/app/views/NewMessageView.js
index cfadd6094..285a49d5a 100644
--- a/app/views/NewMessageView.js
+++ b/app/views/NewMessageView.js
@@ -183,7 +183,7 @@ export default class NewMessageView extends React.Component {
 	}
 
 	render = () => (
-		<SafeAreaView style={styles.safeAreaView} testID='new-message-view' forceInset={{ bottom: 'never' }}>
+		<SafeAreaView style={styles.safeAreaView} testID='new-message-view' forceInset={{ vertical: 'never' }}>
 			<StatusBar />
 			{this.renderList()}
 		</SafeAreaView>
diff --git a/app/views/NewServerView.js b/app/views/NewServerView.js
index 7d2377d9c..30ec070c5 100644
--- a/app/views/NewServerView.js
+++ b/app/views/NewServerView.js
@@ -164,7 +164,7 @@ export default class NewServerView extends React.Component {
 			>
 				<StatusBar light />
 				<ScrollView {...scrollPersistTaps} contentContainerStyle={sharedStyles.containerScrollView}>
-					<SafeAreaView style={sharedStyles.container} testID='new-server-view' forceInset={{ bottom: 'never' }}>
+					<SafeAreaView style={sharedStyles.container} testID='new-server-view' forceInset={{ vertical: 'never' }}>
 						<Image style={styles.image} source={{ uri: 'new_server' }} />
 						<Text style={styles.title}>{I18n.t('Sign_in_your_server')}</Text>
 						<TextInput
diff --git a/app/views/OnboardingView/index.js b/app/views/OnboardingView/index.js
index 6655bc9f4..1ca9b4b37 100644
--- a/app/views/OnboardingView/index.js
+++ b/app/views/OnboardingView/index.js
@@ -134,7 +134,7 @@ export default class OnboardingView extends React.Component {
 
 	render() {
 		return (
-			<SafeAreaView style={styles.container} testID='onboarding-view' forceInset={{ bottom: 'never' }}>
+			<SafeAreaView style={styles.container} testID='onboarding-view' forceInset={{ vertical: 'never' }}>
 				<StatusBar light />
 				<Image style={styles.onboarding} source={{ uri: 'onboarding' }} fadeDuration={0} />
 				<Text style={styles.title}>{I18n.t('Welcome_to_RocketChat')}</Text>
diff --git a/app/views/ProfileView/index.js b/app/views/ProfileView/index.js
index 12cae6503..7d6dd0436 100644
--- a/app/views/ProfileView/index.js
+++ b/app/views/ProfileView/index.js
@@ -393,7 +393,7 @@ export default class ProfileView extends React.Component {
 					testID='profile-view-list'
 					{...scrollPersistTaps}
 				>
-					<SafeAreaView style={sharedStyles.container} testID='profile-view' forceInset={{ bottom: 'never' }}>
+					<SafeAreaView style={sharedStyles.container} testID='profile-view' forceInset={{ vertical: 'never' }}>
 						<View style={styles.avatarContainer} testID='profile-view-avatar'>
 							<Avatar
 								text={username}
diff --git a/app/views/RegisterView.js b/app/views/RegisterView.js
index abb8f52b3..22e1c5268 100644
--- a/app/views/RegisterView.js
+++ b/app/views/RegisterView.js
@@ -203,7 +203,7 @@ export default class RegisterView extends React.Component {
 			<KeyboardView contentContainerStyle={sharedStyles.container}>
 				<StatusBar />
 				<ScrollView {...scrollPersistTaps} contentContainerStyle={sharedStyles.containerScrollView}>
-					<SafeAreaView style={sharedStyles.container} testID='register-view' forceInset={{ bottom: 'never' }}>
+					<SafeAreaView style={sharedStyles.container} testID='register-view' forceInset={{ vertical: 'never' }}>
 						<Text style={[sharedStyles.loginTitle, sharedStyles.textBold]}>{I18n.t('Sign_Up')}</Text>
 						<TextInput
 							inputRef={(e) => { this.nameInput = e; }}
diff --git a/app/views/RoomActionsView/index.js b/app/views/RoomActionsView/index.js
index 4c875db31..009e4beb5 100644
--- a/app/views/RoomActionsView/index.js
+++ b/app/views/RoomActionsView/index.js
@@ -483,7 +483,7 @@ export default class RoomActionsView extends React.Component {
 
 	render() {
 		return (
-			<SafeAreaView style={styles.container} testID='room-actions-view' forceInset={{ bottom: 'never' }}>
+			<SafeAreaView style={styles.container} testID='room-actions-view' forceInset={{ vertical: 'never' }}>
 				<StatusBar />
 				<SectionList
 					contentContainerStyle={styles.contentContainer}
diff --git a/app/views/RoomInfoEditView/index.js b/app/views/RoomInfoEditView/index.js
index d228beb32..2fcb74bfc 100644
--- a/app/views/RoomInfoEditView/index.js
+++ b/app/views/RoomInfoEditView/index.js
@@ -299,7 +299,7 @@ export default class RoomInfoEditView extends React.Component {
 					testID='room-info-edit-view-list'
 					{...scrollPersistTaps}
 				>
-					<SafeAreaView style={sharedStyles.container} testID='room-info-edit-view' forceInset={{ bottom: 'never' }}>
+					<SafeAreaView style={sharedStyles.container} testID='room-info-edit-view' forceInset={{ vertical: 'never' }}>
 						<RCTextInput
 							inputRef={(e) => { this.name = e; }}
 							label={I18n.t('Name')}
diff --git a/app/views/RoomInfoView/index.js b/app/views/RoomInfoView/index.js
index 2095d577b..c224c8487 100644
--- a/app/views/RoomInfoView/index.js
+++ b/app/views/RoomInfoView/index.js
@@ -247,7 +247,7 @@ export default class RoomInfoView extends React.Component {
 		return (
 			<ScrollView style={styles.scroll}>
 				<StatusBar />
-				<SafeAreaView style={styles.container} testID='room-info-view' forceInset={{ bottom: 'never' }}>
+				<SafeAreaView style={styles.container} testID='room-info-view' forceInset={{ vertical: 'never' }}>
 					<View style={styles.avatarContainer}>
 						{this.renderAvatar(room, roomUser)}
 						<View style={styles.roomTitleContainer}>{ getRoomTitle(room) }</View>
diff --git a/app/views/RoomMembersView/index.js b/app/views/RoomMembersView/index.js
index 55d91bd47..5e5dd7bba 100644
--- a/app/views/RoomMembersView/index.js
+++ b/app/views/RoomMembersView/index.js
@@ -279,7 +279,7 @@ export default class RoomMembersView extends React.Component {
 		// 	return <ActivityIndicator style={styles.loading} />;
 		// }
 		return (
-			<SafeAreaView style={styles.list} testID='room-members-view' forceInset={{ bottom: 'never' }}>
+			<SafeAreaView style={styles.list} testID='room-members-view' forceInset={{ vertical: 'never' }}>
 				<StatusBar />
 				<FlatList
 					data={filtering ? membersFiltered : members}
diff --git a/app/views/RoomView/index.js b/app/views/RoomView/index.js
index 42a9ae9a3..d5cdc099e 100644
--- a/app/views/RoomView/index.js
+++ b/app/views/RoomView/index.js
@@ -617,7 +617,7 @@ export default class RoomView extends React.Component {
 		const { rid, t } = room;
 
 		return (
-			<SafeAreaView style={styles.container} testID='room-view' forceInset={{ bottom: 'never' }}>
+			<SafeAreaView style={styles.container} testID='room-view' forceInset={{ vertical: 'never' }}>
 				<StatusBar />
 				<List rid={rid} t={t} tmid={this.tmid} renderRow={this.renderItem} />
 				{this.renderFooter()}
diff --git a/app/views/RoomsListView/index.js b/app/views/RoomsListView/index.js
index c2dc0a8a8..076672f97 100644
--- a/app/views/RoomsListView/index.js
+++ b/app/views/RoomsListView/index.js
@@ -633,7 +633,7 @@ export default class RoomsListView extends React.Component {
 		} = this.props;
 
 		return (
-			<SafeAreaView style={styles.container} testID='rooms-list-view' forceInset={{ bottom: 'never' }}>
+			<SafeAreaView style={styles.container} testID='rooms-list-view' forceInset={{ vertical: 'never' }}>
 				<StatusBar />
 				{this.renderScroll()}
 				{showSortDropdown
diff --git a/app/views/SearchMessagesView/index.js b/app/views/SearchMessagesView/index.js
index ab98b8c8e..5aad1a4fb 100644
--- a/app/views/SearchMessagesView/index.js
+++ b/app/views/SearchMessagesView/index.js
@@ -132,7 +132,7 @@ export default class SearchMessagesView extends React.Component {
 
 	render() {
 		return (
-			<SafeAreaView style={styles.container} testID='search-messages-view' forceInset={{ bottom: 'never' }}>
+			<SafeAreaView style={styles.container} testID='search-messages-view' forceInset={{ vertical: 'never' }}>
 				<StatusBar />
 				<View style={styles.searchContainer}>
 					<RCTextInput
diff --git a/app/views/SelectServerView.js b/app/views/SelectServerView.js
index 4a40edb19..f3abf47d9 100644
--- a/app/views/SelectServerView.js
+++ b/app/views/SelectServerView.js
@@ -91,7 +91,7 @@ export default class SelectServerView extends React.Component {
 		return (
 			<SafeAreaView
 				style={styles.container}
-				forceInset={{ bottom: 'never' }}
+				forceInset={{ vertical: 'never' }}
 			>
 				<StatusBar />
 				<View style={styles.list}>
diff --git a/app/views/SelectedUsersView.js b/app/views/SelectedUsersView.js
index 854511017..f807bb8c1 100644
--- a/app/views/SelectedUsersView.js
+++ b/app/views/SelectedUsersView.js
@@ -270,7 +270,7 @@ export default class SelectedUsersView extends React.Component {
 	render = () => {
 		const { loading } = this.props;
 		return (
-			<SafeAreaView style={styles.safeAreaView} testID='select-users-view' forceInset={{ bottom: 'never' }}>
+			<SafeAreaView style={styles.safeAreaView} testID='select-users-view' forceInset={{ vertical: 'never' }}>
 				<StatusBar />
 				{this.renderList()}
 				<Loading visible={loading} />
diff --git a/app/views/SetUsernameView.js b/app/views/SetUsernameView.js
index 0af5163b2..c09501248 100644
--- a/app/views/SetUsernameView.js
+++ b/app/views/SetUsernameView.js
@@ -109,7 +109,7 @@ export default class SetUsernameView extends React.Component {
 			<KeyboardView contentContainerStyle={sharedStyles.container}>
 				<StatusBar />
 				<ScrollView {...scrollPersistTaps} contentContainerStyle={sharedStyles.containerScrollView}>
-					<SafeAreaView style={sharedStyles.container} testID='set-username-view' forceInset={{ bottom: 'never' }}>
+					<SafeAreaView style={sharedStyles.container} testID='set-username-view' forceInset={{ vertical: 'never' }}>
 						<Text style={[sharedStyles.loginTitle, sharedStyles.textBold, styles.loginTitle]}>{I18n.t('Username')}</Text>
 						<Text style={[sharedStyles.loginSubtitle, sharedStyles.textRegular]}>{I18n.t('Set_username_subtitle')}</Text>
 						<TextInput
diff --git a/app/views/ShareListView/index.js b/app/views/ShareListView/index.js
index 0a3596b70..535207882 100644
--- a/app/views/ShareListView/index.js
+++ b/app/views/ShareListView/index.js
@@ -486,7 +486,7 @@ export default class ShareListView extends React.Component {
 	render() {
 		const showError = !this.canUploadFile();
 		return (
-			<SafeAreaView style={styles.container} forceInset={{ bottom: 'never' }}>
+			<SafeAreaView style={styles.container} forceInset={{ vertical: 'never' }}>
 				{ showError ? this.renderError() : this.renderScrollView() }
 			</SafeAreaView>
 		);
diff --git a/app/views/ThreadMessagesView/index.js b/app/views/ThreadMessagesView/index.js
index 42e9f4a08..e3ba81dc8 100644
--- a/app/views/ThreadMessagesView/index.js
+++ b/app/views/ThreadMessagesView/index.js
@@ -249,7 +249,7 @@ export default class ThreadMessagesView extends React.Component {
 		}
 
 		return (
-			<SafeAreaView style={styles.list} testID='thread-messages-view' forceInset={{ bottom: 'never' }}>
+			<SafeAreaView style={styles.list} testID='thread-messages-view' forceInset={{ vertical: 'never' }}>
 				<StatusBar />
 				<FlatList
 					data={messages}