diff --git a/React/Modules/RCTUIManager.m b/React/Modules/RCTUIManager.m
index 3a1c2f25aa..40c0f7eb88 100644
--- a/React/Modules/RCTUIManager.m
+++ b/React/Modules/RCTUIManager.m
@@ -765,11 +765,11 @@ RCT_EXPORT_METHOD(createView:(nonnull NSNumber *)reactTag
 }
 
 RCT_EXPORT_METHOD(updateView:(nonnull NSNumber *)reactTag
-                  viewName:(__unused NSString *)viewName // not reliable, do not use
+                  viewName:(NSString *)viewName // not always reliable, use shadowView.viewName if available
                   props:(NSDictionary *)props)
 {
   RCTShadowView *shadowView = _shadowViewRegistry[reactTag];
-  RCTComponentData *componentData = _componentDataByName[shadowView.viewName];
+  RCTComponentData *componentData = _componentDataByName[shadowView.viewName ?: viewName];
   [componentData setProps:props forShadowView:shadowView];
 
   [self addUIBlock:^(__unused RCTUIManager *uiManager, RCTSparseArray *viewRegistry) {