diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyOptimizer.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyOptimizer.java
index a42f3501ad5..701fb1f2855 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyOptimizer.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyOptimizer.java
@@ -446,4 +446,14 @@ public class NativeViewHierarchyOptimizer {
     }
     return true;
   }
+
+  /**
+   * Called when all the view updates of {@link ReactShadowNode} received as a parameter were
+   * processed.
+   */
+  void onViewUpdatesCompleted(ReactShadowNode cssNode) {
+    // cssNode is not being used, but it is passed as a parameter in case this is required in the
+    // future.
+    mTagsWithLayoutVisited.clear();
+  }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java
index ea6d4894821..267461d84fb 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java
@@ -920,6 +920,7 @@ public class UIImplementation {
       }
     }
     cssNode.markUpdateSeen();
+    mNativeViewHierarchyOptimizer.onViewUpdatesCompleted(cssNode);
   }
 
   public void addUIBlock(UIBlock block) {