diff --git a/ReactCommon/react/renderer/mounting/ShadowView.cpp b/ReactCommon/react/renderer/mounting/ShadowView.cpp
index f717a28fe669f6..32b84c8b26c036 100644
--- a/ReactCommon/react/renderer/mounting/ShadowView.cpp
+++ b/ReactCommon/react/renderer/mounting/ShadowView.cpp
@@ -22,6 +22,7 @@ static LayoutMetrics layoutMetricsFromShadowNode(ShadowNode const &shadowNode) {
 ShadowView::ShadowView(const ShadowNode &shadowNode)
     : componentName(shadowNode.getComponentName()),
       componentHandle(shadowNode.getComponentHandle()),
+      surfaceId(shadowNode.getSurfaceId()),
       tag(shadowNode.getTag()),
       props(shadowNode.getProps()),
       eventEmitter(shadowNode.getEventEmitter()),
@@ -30,6 +31,7 @@ ShadowView::ShadowView(const ShadowNode &shadowNode)
 
 bool ShadowView::operator==(const ShadowView &rhs) const {
   return std::tie(
+             this->surfaceId,
              this->tag,
              this->componentName,
              this->props,
@@ -37,6 +39,7 @@ bool ShadowView::operator==(const ShadowView &rhs) const {
              this->layoutMetrics,
              this->state) ==
       std::tie(
+             rhs.surfaceId,
              rhs.tag,
              rhs.componentName,
              rhs.props,
@@ -59,6 +62,7 @@ std::vector<DebugStringConvertibleObject> getDebugProps(
     ShadowView const &object,
     DebugStringConvertibleOptions options) {
   return {
+      {"surfaceId", getDebugDescription(object.surfaceId, options)},
       {"tag", getDebugDescription(object.tag, options)},
       {"props", getDebugDescription(object.props, options)},
       {"eventEmitter", getDebugDescription(object.eventEmitter, options)},
diff --git a/ReactCommon/react/renderer/mounting/ShadowView.h b/ReactCommon/react/renderer/mounting/ShadowView.h
index 3e65e0262c56ff..7d0a7617a68a75 100644
--- a/ReactCommon/react/renderer/mounting/ShadowView.h
+++ b/ReactCommon/react/renderer/mounting/ShadowView.h
@@ -40,6 +40,7 @@ struct ShadowView final {
 
   ComponentName componentName{};
   ComponentHandle componentHandle{};
+  SurfaceId surfaceId{};
   Tag tag{};
   Props::Shared props{};
   EventEmitter::Shared eventEmitter{};
diff --git a/ReactCommon/react/renderer/mounting/StubView.cpp b/ReactCommon/react/renderer/mounting/StubView.cpp
index 503325a139716d..737fbb0286706f 100644
--- a/ReactCommon/react/renderer/mounting/StubView.cpp
+++ b/ReactCommon/react/renderer/mounting/StubView.cpp
@@ -14,6 +14,7 @@ StubView::operator ShadowView() const {
   auto shadowView = ShadowView{};
   shadowView.componentName = componentName;
   shadowView.componentHandle = componentHandle;
+  shadowView.surfaceId = surfaceId;
   shadowView.tag = tag;
   shadowView.props = props;
   shadowView.eventEmitter = eventEmitter;
@@ -25,6 +26,7 @@ StubView::operator ShadowView() const {
 void StubView::update(ShadowView const &shadowView) {
   componentName = shadowView.componentName;
   componentHandle = shadowView.componentHandle;
+  surfaceId = shadowView.surfaceId;
   tag = shadowView.tag;
   props = shadowView.props;
   eventEmitter = shadowView.eventEmitter;
@@ -53,6 +55,7 @@ std::vector<DebugStringConvertibleObject> getDebugProps(
     StubView const &stubView,
     DebugStringConvertibleOptions options) {
   return {
+      {"surfaceId", getDebugDescription(stubView.surfaceId, options)},
       {"tag", getDebugDescription(stubView.tag, options)},
       {"props", getDebugDescription(stubView.props, options)},
       {"eventEmitter", getDebugDescription(stubView.eventEmitter, options)},
diff --git a/ReactCommon/react/renderer/mounting/StubView.h b/ReactCommon/react/renderer/mounting/StubView.h
index 3c95f68f5be24f..ca433c953b3020 100644
--- a/ReactCommon/react/renderer/mounting/StubView.h
+++ b/ReactCommon/react/renderer/mounting/StubView.h
@@ -31,6 +31,7 @@ class StubView final {
 
   ComponentName componentName;
   ComponentHandle componentHandle;
+  SurfaceId surfaceId;
   Tag tag;
   SharedProps props;
   SharedEventEmitter eventEmitter;