diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java b/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java
index 1c2882958dd..2c4802e241d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java
@@ -59,8 +59,6 @@ public class ReactRootView extends SizeMonitoringFrameLayout implements RootView
   private @Nullable KeyboardListener mKeyboardListener;
   private @Nullable OnGenericMotionListener mOnGenericMotionListener;
   private boolean mWasMeasured = false;
-  private boolean mAttachScheduled = false;
-  private boolean mIsAttachedToWindow = false;
   private boolean mIsAttachedToInstance = false;
   private final JSTouchDispatcher mJSTouchDispatcher = new JSTouchDispatcher(this);
 
@@ -92,18 +90,13 @@ public class ReactRootView extends SizeMonitoringFrameLayout implements RootView
         MeasureSpec.getSize(heightMeasureSpec));
 
     mWasMeasured = true;
-    if (mAttachScheduled && mReactInstanceManager != null && mIsAttachedToWindow) {
-      // Scheduled from {@link #startReactApplication} call in case when the view measurements are
-      // not available
-      mAttachScheduled = false;
+    // Check if we were waiting for onMeasure to attach the root view
+    if (mReactInstanceManager != null && !mIsAttachedToInstance) {
       // Enqueue it to UIThread not to block onMeasure waiting for the catalyst instance creation
       UiThreadUtil.runOnUiThread(new Runnable() {
         @Override
         public void run() {
-          Assertions.assertNotNull(mReactInstanceManager)
-              .attachMeasuredRootView(ReactRootView.this);
-          mIsAttachedToInstance = true;
-          getViewTreeObserver().addOnGlobalLayoutListener(getKeyboardListener());
+          attachToReactInstanceManager();
         }
       });
     }
@@ -176,28 +169,13 @@ public class ReactRootView extends SizeMonitoringFrameLayout implements RootView
   protected void onDetachedFromWindow() {
     super.onDetachedFromWindow();
 
-    mIsAttachedToWindow = false;
-
-    if (mReactInstanceManager != null && !mAttachScheduled) {
+    if (mReactInstanceManager != null && mIsAttachedToInstance) {
       mReactInstanceManager.detachRootView(this);
       mIsAttachedToInstance = false;
       getViewTreeObserver().removeOnGlobalLayoutListener(getKeyboardListener());
     }
   }
 
-  @Override
-  protected void onAttachedToWindow() {
-    super.onAttachedToWindow();
-
-    mIsAttachedToWindow = true;
-
-    // If the view re-attached and catalyst instance has been set before, we'd attach again to the
-    // catalyst instance (expecting measure to be called after {@link onAttachedToWindow})
-    if (mReactInstanceManager != null) {
-      mAttachScheduled = true;
-    }
-  }
-
   /**
    * {@see #startReactApplication(ReactInstanceManager, String, android.os.Bundle)}
    */
@@ -222,8 +200,7 @@ public class ReactRootView extends SizeMonitoringFrameLayout implements RootView
     // it in the case of re-creating the catalyst instance
     Assertions.assertCondition(
         mReactInstanceManager == null,
-        "This root view has already " +
-          "been attached to a catalyst instance manager");
+        "This root view has already been attached to a catalyst instance manager");
 
     mReactInstanceManager = reactInstanceManager;
     mJSModuleName = moduleName;
@@ -233,15 +210,10 @@ public class ReactRootView extends SizeMonitoringFrameLayout implements RootView
       mReactInstanceManager.createReactContextInBackground();
     }
 
-    // We need to wait for the initial onMeasure, if this view has not yet been measured, we set
-    // mAttachScheduled flag, which will make this view startReactApplication itself to instance
-    // manager once onMeasure is called.
-    if (mWasMeasured && mIsAttachedToWindow) {
-      mReactInstanceManager.attachMeasuredRootView(this);
-      mIsAttachedToInstance = true;
-      getViewTreeObserver().addOnGlobalLayoutListener(getKeyboardListener());
-    } else {
-      mAttachScheduled = true;
+    // We need to wait for the initial onMeasure, if this view has not yet been measured, we set which
+    // will make this view startReactApplication itself to instance manager once onMeasure is called.
+    if (mWasMeasured) {
+      attachToReactInstanceManager();
     }
   }
 
@@ -259,7 +231,6 @@ public class ReactRootView extends SizeMonitoringFrameLayout implements RootView
    */
   @VisibleForTesting
   /* package */ void simulateAttachForTesting() {
-    mIsAttachedToWindow = true;
     mIsAttachedToInstance = true;
     mWasMeasured = true;
   }
@@ -271,6 +242,16 @@ public class ReactRootView extends SizeMonitoringFrameLayout implements RootView
     return mKeyboardListener;
   }
 
+  private void attachToReactInstanceManager() {
+    if (mIsAttachedToInstance) {
+      return;
+    }
+
+    mIsAttachedToInstance = true;
+    Assertions.assertNotNull(mReactInstanceManager).attachMeasuredRootView(this);
+    getViewTreeObserver().addOnGlobalLayoutListener(getKeyboardListener());
+  }
+
   private class KeyboardListener implements ViewTreeObserver.OnGlobalLayoutListener {
     private final Rect mVisibleViewArea;
     private final int mMinKeyboardHeightDetected;