diff --git a/Libraries/Renderer/implementations/ReactFabric-dev.fb.js b/Libraries/Renderer/implementations/ReactFabric-dev.fb.js
index 559d7b606aa..fe7c273e59e 100644
--- a/Libraries/Renderer/implementations/ReactFabric-dev.fb.js
+++ b/Libraries/Renderer/implementations/ReactFabric-dev.fb.js
@@ -15755,6 +15755,7 @@ function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
   if (typeof getDerivedStateFromError === "function") {
     var error = errorInfo.value;
     update.payload = function() {
+      logError(fiber, errorInfo);
       return getDerivedStateFromError(error);
     };
   }
@@ -15772,10 +15773,10 @@ function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
         // TODO: Warn in strict mode if getDerivedStateFromError is
         // not defined.
         markLegacyErrorBoundaryAsFailed(this);
+        logError(fiber, errorInfo);
       }
       var error = errorInfo.value;
       var stack = errorInfo.stack;
-      logError(fiber, errorInfo);
       this.componentDidCatch(error, {
         componentStack: stack !== null ? stack : ""
       });
diff --git a/Libraries/Renderer/implementations/ReactFabric-dev.js b/Libraries/Renderer/implementations/ReactFabric-dev.js
index 22db2609940..e80eac23729 100644
--- a/Libraries/Renderer/implementations/ReactFabric-dev.js
+++ b/Libraries/Renderer/implementations/ReactFabric-dev.js
@@ -15751,6 +15751,7 @@ function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
   if (typeof getDerivedStateFromError === "function") {
     var error = errorInfo.value;
     update.payload = function() {
+      logError(fiber, errorInfo);
       return getDerivedStateFromError(error);
     };
   }
@@ -15768,10 +15769,10 @@ function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
         // TODO: Warn in strict mode if getDerivedStateFromError is
         // not defined.
         markLegacyErrorBoundaryAsFailed(this);
+        logError(fiber, errorInfo);
       }
       var error = errorInfo.value;
       var stack = errorInfo.stack;
-      logError(fiber, errorInfo);
       this.componentDidCatch(error, {
         componentStack: stack !== null ? stack : ""
       });
diff --git a/Libraries/Renderer/implementations/ReactFabric-prod.fb.js b/Libraries/Renderer/implementations/ReactFabric-prod.fb.js
index 5337dbf5210..5b5cc3c0015 100644
--- a/Libraries/Renderer/implementations/ReactFabric-prod.fb.js
+++ b/Libraries/Renderer/implementations/ReactFabric-prod.fb.js
@@ -4609,9 +4609,10 @@ function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
   expirationTime.tag = 3;
   var getDerivedStateFromError = fiber.type.getDerivedStateFromError;
   if ("function" === typeof getDerivedStateFromError) {
-    var error$jscomp$0 = errorInfo.value;
+    var error = errorInfo.value;
     expirationTime.payload = function() {
-      return getDerivedStateFromError(error$jscomp$0);
+      logError(fiber, errorInfo);
+      return getDerivedStateFromError(error);
     };
   }
   var inst = fiber.stateNode;
@@ -4621,11 +4622,10 @@ function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
       "function" !== typeof getDerivedStateFromError &&
         (null === legacyErrorBoundariesThatAlreadyFailed
           ? (legacyErrorBoundariesThatAlreadyFailed = new Set([this]))
-          : legacyErrorBoundariesThatAlreadyFailed.add(this));
-      var error = errorInfo.value,
-        stack = errorInfo.stack;
-      logError(fiber, errorInfo);
-      this.componentDidCatch(error, {
+          : legacyErrorBoundariesThatAlreadyFailed.add(this),
+        logError(fiber, errorInfo));
+      var stack = errorInfo.stack;
+      this.componentDidCatch(errorInfo.value, {
         componentStack: null !== stack ? stack : ""
       });
     });
diff --git a/Libraries/Renderer/implementations/ReactFabric-prod.js b/Libraries/Renderer/implementations/ReactFabric-prod.js
index 7c6c7709b9f..1ac5cef90b4 100644
--- a/Libraries/Renderer/implementations/ReactFabric-prod.js
+++ b/Libraries/Renderer/implementations/ReactFabric-prod.js
@@ -4609,9 +4609,10 @@ function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
   expirationTime.tag = 3;
   var getDerivedStateFromError = fiber.type.getDerivedStateFromError;
   if ("function" === typeof getDerivedStateFromError) {
-    var error$jscomp$0 = errorInfo.value;
+    var error = errorInfo.value;
     expirationTime.payload = function() {
-      return getDerivedStateFromError(error$jscomp$0);
+      logError(fiber, errorInfo);
+      return getDerivedStateFromError(error);
     };
   }
   var inst = fiber.stateNode;
@@ -4621,11 +4622,10 @@ function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
       "function" !== typeof getDerivedStateFromError &&
         (null === legacyErrorBoundariesThatAlreadyFailed
           ? (legacyErrorBoundariesThatAlreadyFailed = new Set([this]))
-          : legacyErrorBoundariesThatAlreadyFailed.add(this));
-      var error = errorInfo.value,
-        stack = errorInfo.stack;
-      logError(fiber, errorInfo);
-      this.componentDidCatch(error, {
+          : legacyErrorBoundariesThatAlreadyFailed.add(this),
+        logError(fiber, errorInfo));
+      var stack = errorInfo.stack;
+      this.componentDidCatch(errorInfo.value, {
         componentStack: null !== stack ? stack : ""
       });
     });
diff --git a/Libraries/Renderer/implementations/ReactFabric-profiling.fb.js b/Libraries/Renderer/implementations/ReactFabric-profiling.fb.js
index 4825c763786..8f44f7111e6 100644
--- a/Libraries/Renderer/implementations/ReactFabric-profiling.fb.js
+++ b/Libraries/Renderer/implementations/ReactFabric-profiling.fb.js
@@ -4831,9 +4831,10 @@ function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
   expirationTime.tag = 3;
   var getDerivedStateFromError = fiber.type.getDerivedStateFromError;
   if ("function" === typeof getDerivedStateFromError) {
-    var error$jscomp$0 = errorInfo.value;
+    var error = errorInfo.value;
     expirationTime.payload = function() {
-      return getDerivedStateFromError(error$jscomp$0);
+      logError(fiber, errorInfo);
+      return getDerivedStateFromError(error);
     };
   }
   var inst = fiber.stateNode;
@@ -4843,11 +4844,10 @@ function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
       "function" !== typeof getDerivedStateFromError &&
         (null === legacyErrorBoundariesThatAlreadyFailed
           ? (legacyErrorBoundariesThatAlreadyFailed = new Set([this]))
-          : legacyErrorBoundariesThatAlreadyFailed.add(this));
-      var error = errorInfo.value,
-        stack = errorInfo.stack;
-      logError(fiber, errorInfo);
-      this.componentDidCatch(error, {
+          : legacyErrorBoundariesThatAlreadyFailed.add(this),
+        logError(fiber, errorInfo));
+      var stack = errorInfo.stack;
+      this.componentDidCatch(errorInfo.value, {
         componentStack: null !== stack ? stack : ""
       });
     });
diff --git a/Libraries/Renderer/implementations/ReactFabric-profiling.js b/Libraries/Renderer/implementations/ReactFabric-profiling.js
index 78586f0f852..1d9cc485a5c 100644
--- a/Libraries/Renderer/implementations/ReactFabric-profiling.js
+++ b/Libraries/Renderer/implementations/ReactFabric-profiling.js
@@ -4831,9 +4831,10 @@ function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
   expirationTime.tag = 3;
   var getDerivedStateFromError = fiber.type.getDerivedStateFromError;
   if ("function" === typeof getDerivedStateFromError) {
-    var error$jscomp$0 = errorInfo.value;
+    var error = errorInfo.value;
     expirationTime.payload = function() {
-      return getDerivedStateFromError(error$jscomp$0);
+      logError(fiber, errorInfo);
+      return getDerivedStateFromError(error);
     };
   }
   var inst = fiber.stateNode;
@@ -4843,11 +4844,10 @@ function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
       "function" !== typeof getDerivedStateFromError &&
         (null === legacyErrorBoundariesThatAlreadyFailed
           ? (legacyErrorBoundariesThatAlreadyFailed = new Set([this]))
-          : legacyErrorBoundariesThatAlreadyFailed.add(this));
-      var error = errorInfo.value,
-        stack = errorInfo.stack;
-      logError(fiber, errorInfo);
-      this.componentDidCatch(error, {
+          : legacyErrorBoundariesThatAlreadyFailed.add(this),
+        logError(fiber, errorInfo));
+      var stack = errorInfo.stack;
+      this.componentDidCatch(errorInfo.value, {
         componentStack: null !== stack ? stack : ""
       });
     });
diff --git a/Libraries/Renderer/implementations/ReactNativeRenderer-dev.fb.js b/Libraries/Renderer/implementations/ReactNativeRenderer-dev.fb.js
index 7de0e185707..39549939d1f 100644
--- a/Libraries/Renderer/implementations/ReactNativeRenderer-dev.fb.js
+++ b/Libraries/Renderer/implementations/ReactNativeRenderer-dev.fb.js
@@ -16069,6 +16069,7 @@ function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
   if (typeof getDerivedStateFromError === "function") {
     var error = errorInfo.value;
     update.payload = function() {
+      logError(fiber, errorInfo);
       return getDerivedStateFromError(error);
     };
   }
@@ -16086,10 +16087,10 @@ function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
         // TODO: Warn in strict mode if getDerivedStateFromError is
         // not defined.
         markLegacyErrorBoundaryAsFailed(this);
+        logError(fiber, errorInfo);
       }
       var error = errorInfo.value;
       var stack = errorInfo.stack;
-      logError(fiber, errorInfo);
       this.componentDidCatch(error, {
         componentStack: stack !== null ? stack : ""
       });
diff --git a/Libraries/Renderer/implementations/ReactNativeRenderer-dev.js b/Libraries/Renderer/implementations/ReactNativeRenderer-dev.js
index e79d69f0bf8..80543677439 100644
--- a/Libraries/Renderer/implementations/ReactNativeRenderer-dev.js
+++ b/Libraries/Renderer/implementations/ReactNativeRenderer-dev.js
@@ -16065,6 +16065,7 @@ function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
   if (typeof getDerivedStateFromError === "function") {
     var error = errorInfo.value;
     update.payload = function() {
+      logError(fiber, errorInfo);
       return getDerivedStateFromError(error);
     };
   }
@@ -16082,10 +16083,10 @@ function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
         // TODO: Warn in strict mode if getDerivedStateFromError is
         // not defined.
         markLegacyErrorBoundaryAsFailed(this);
+        logError(fiber, errorInfo);
       }
       var error = errorInfo.value;
       var stack = errorInfo.stack;
-      logError(fiber, errorInfo);
       this.componentDidCatch(error, {
         componentStack: stack !== null ? stack : ""
       });
diff --git a/Libraries/Renderer/implementations/ReactNativeRenderer-prod.fb.js b/Libraries/Renderer/implementations/ReactNativeRenderer-prod.fb.js
index 31d34c44a62..409f8abc67b 100644
--- a/Libraries/Renderer/implementations/ReactNativeRenderer-prod.fb.js
+++ b/Libraries/Renderer/implementations/ReactNativeRenderer-prod.fb.js
@@ -4883,9 +4883,10 @@ function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
   expirationTime.tag = 3;
   var getDerivedStateFromError = fiber.type.getDerivedStateFromError;
   if ("function" === typeof getDerivedStateFromError) {
-    var error$jscomp$0 = errorInfo.value;
+    var error = errorInfo.value;
     expirationTime.payload = function() {
-      return getDerivedStateFromError(error$jscomp$0);
+      logError(fiber, errorInfo);
+      return getDerivedStateFromError(error);
     };
   }
   var inst = fiber.stateNode;
@@ -4895,11 +4896,10 @@ function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
       "function" !== typeof getDerivedStateFromError &&
         (null === legacyErrorBoundariesThatAlreadyFailed
           ? (legacyErrorBoundariesThatAlreadyFailed = new Set([this]))
-          : legacyErrorBoundariesThatAlreadyFailed.add(this));
-      var error = errorInfo.value,
-        stack = errorInfo.stack;
-      logError(fiber, errorInfo);
-      this.componentDidCatch(error, {
+          : legacyErrorBoundariesThatAlreadyFailed.add(this),
+        logError(fiber, errorInfo));
+      var stack = errorInfo.stack;
+      this.componentDidCatch(errorInfo.value, {
         componentStack: null !== stack ? stack : ""
       });
     });
diff --git a/Libraries/Renderer/implementations/ReactNativeRenderer-prod.js b/Libraries/Renderer/implementations/ReactNativeRenderer-prod.js
index 9d7209a9c0f..ee6d7826c47 100644
--- a/Libraries/Renderer/implementations/ReactNativeRenderer-prod.js
+++ b/Libraries/Renderer/implementations/ReactNativeRenderer-prod.js
@@ -4883,9 +4883,10 @@ function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
   expirationTime.tag = 3;
   var getDerivedStateFromError = fiber.type.getDerivedStateFromError;
   if ("function" === typeof getDerivedStateFromError) {
-    var error$jscomp$0 = errorInfo.value;
+    var error = errorInfo.value;
     expirationTime.payload = function() {
-      return getDerivedStateFromError(error$jscomp$0);
+      logError(fiber, errorInfo);
+      return getDerivedStateFromError(error);
     };
   }
   var inst = fiber.stateNode;
@@ -4895,11 +4896,10 @@ function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
       "function" !== typeof getDerivedStateFromError &&
         (null === legacyErrorBoundariesThatAlreadyFailed
           ? (legacyErrorBoundariesThatAlreadyFailed = new Set([this]))
-          : legacyErrorBoundariesThatAlreadyFailed.add(this));
-      var error = errorInfo.value,
-        stack = errorInfo.stack;
-      logError(fiber, errorInfo);
-      this.componentDidCatch(error, {
+          : legacyErrorBoundariesThatAlreadyFailed.add(this),
+        logError(fiber, errorInfo));
+      var stack = errorInfo.stack;
+      this.componentDidCatch(errorInfo.value, {
         componentStack: null !== stack ? stack : ""
       });
     });
diff --git a/Libraries/Renderer/implementations/ReactNativeRenderer-profiling.fb.js b/Libraries/Renderer/implementations/ReactNativeRenderer-profiling.fb.js
index 742a08fe5fa..0ba66216d52 100644
--- a/Libraries/Renderer/implementations/ReactNativeRenderer-profiling.fb.js
+++ b/Libraries/Renderer/implementations/ReactNativeRenderer-profiling.fb.js
@@ -5112,9 +5112,10 @@ function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
   expirationTime.tag = 3;
   var getDerivedStateFromError = fiber.type.getDerivedStateFromError;
   if ("function" === typeof getDerivedStateFromError) {
-    var error$jscomp$0 = errorInfo.value;
+    var error = errorInfo.value;
     expirationTime.payload = function() {
-      return getDerivedStateFromError(error$jscomp$0);
+      logError(fiber, errorInfo);
+      return getDerivedStateFromError(error);
     };
   }
   var inst = fiber.stateNode;
@@ -5124,11 +5125,10 @@ function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
       "function" !== typeof getDerivedStateFromError &&
         (null === legacyErrorBoundariesThatAlreadyFailed
           ? (legacyErrorBoundariesThatAlreadyFailed = new Set([this]))
-          : legacyErrorBoundariesThatAlreadyFailed.add(this));
-      var error = errorInfo.value,
-        stack = errorInfo.stack;
-      logError(fiber, errorInfo);
-      this.componentDidCatch(error, {
+          : legacyErrorBoundariesThatAlreadyFailed.add(this),
+        logError(fiber, errorInfo));
+      var stack = errorInfo.stack;
+      this.componentDidCatch(errorInfo.value, {
         componentStack: null !== stack ? stack : ""
       });
     });
diff --git a/Libraries/Renderer/implementations/ReactNativeRenderer-profiling.js b/Libraries/Renderer/implementations/ReactNativeRenderer-profiling.js
index 2acb589d9fc..2224766b657 100644
--- a/Libraries/Renderer/implementations/ReactNativeRenderer-profiling.js
+++ b/Libraries/Renderer/implementations/ReactNativeRenderer-profiling.js
@@ -5112,9 +5112,10 @@ function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
   expirationTime.tag = 3;
   var getDerivedStateFromError = fiber.type.getDerivedStateFromError;
   if ("function" === typeof getDerivedStateFromError) {
-    var error$jscomp$0 = errorInfo.value;
+    var error = errorInfo.value;
     expirationTime.payload = function() {
-      return getDerivedStateFromError(error$jscomp$0);
+      logError(fiber, errorInfo);
+      return getDerivedStateFromError(error);
     };
   }
   var inst = fiber.stateNode;
@@ -5124,11 +5125,10 @@ function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
       "function" !== typeof getDerivedStateFromError &&
         (null === legacyErrorBoundariesThatAlreadyFailed
           ? (legacyErrorBoundariesThatAlreadyFailed = new Set([this]))
-          : legacyErrorBoundariesThatAlreadyFailed.add(this));
-      var error = errorInfo.value,
-        stack = errorInfo.stack;
-      logError(fiber, errorInfo);
-      this.componentDidCatch(error, {
+          : legacyErrorBoundariesThatAlreadyFailed.add(this),
+        logError(fiber, errorInfo));
+      var stack = errorInfo.stack;
+      this.componentDidCatch(errorInfo.value, {
         componentStack: null !== stack ? stack : ""
       });
     });