diff --git a/Libraries/Components/Keyboard/KeyboardAvoidingView.js b/Libraries/Components/Keyboard/KeyboardAvoidingView.js
index b8b123c86bb2fa..c0ba05093cd51c 100644
--- a/Libraries/Components/Keyboard/KeyboardAvoidingView.js
+++ b/Libraries/Components/Keyboard/KeyboardAvoidingView.js
@@ -65,6 +65,7 @@ class KeyboardAvoidingView extends React.Component<Props, State> {
   _frame: ?ViewLayout = null;
   _subscriptions: Array<EmitterSubscription> = [];
   viewRef: {current: React.ElementRef<any> | null};
+  _initialFrameHeight: number = 0;
 
   constructor(props: Props) {
     super(props);
@@ -113,19 +114,11 @@ class KeyboardAvoidingView extends React.Component<Props, State> {
 
   _onLayout = (event: ViewLayoutEvent) => {
     this._frame = event.nativeEvent.layout;
-  };
-
-  UNSAFE_componentWillUpdate(nextProps: Props, nextState: State): void {
-    if (
-      nextState.bottom === this.state.bottom &&
-      this.props.behavior === 'height' &&
-      nextProps.behavior === 'height'
-    ) {
-      // If the component rerenders without an internal state change, e.g.
-      // triggered by parent component re-rendering, no need for bottom to change.
-      nextState.bottom = 0;
+    if (!this._initialFrameHeight) {
+      // save the initial frame height, before the keyboard is visible
+      this._initialFrameHeight = this._frame.height;
     }
-  }
+  };
 
   componentDidMount(): void {
     if (Platform.OS === 'ios') {
@@ -166,7 +159,7 @@ class KeyboardAvoidingView extends React.Component<Props, State> {
           // this.frame.height will never go back to its original value.
           // When height changes, we need to disable flex.
           heightStyle = {
-            height: this._frame.height - bottomHeight,
+            height: this._initialFrameHeight - bottomHeight,
             flex: 0,
           };
         }