diff --git a/src/isomorphic/modern/class/ReactNoopUpdateQueue.js b/src/isomorphic/modern/class/ReactNoopUpdateQueue.js
index 8406b396588fc..6dbee3c143415 100644
--- a/src/isomorphic/modern/class/ReactNoopUpdateQueue.js
+++ b/src/isomorphic/modern/class/ReactNoopUpdateQueue.js
@@ -20,15 +20,7 @@ function warnNoop(publicInstance, callerName) {
     const currentComponent =
       (constructor && (constructor.displayName || constructor.name)) ||
       'ReactClass';
-    const currentComponentError =
-      callerName +
-      '(...): Can only update a mounted or mounting component. ' +
-      'This usually means you called ' +
-      callerName +
-      '() on an unmounted component. ' +
-      'This is a no-op.\n\nPlease check the code for the ' +
-      currentComponent +
-      ' component.';
+    const currentComponentError = `${callerName}_${currentComponent}`;
 
     warning(
       !!errorInfo[currentComponentError],
diff --git a/src/renderers/shared/server/ReactPartialRenderer.js b/src/renderers/shared/server/ReactPartialRenderer.js
index 35ae900bf02ae..830d8f8c5f352 100644
--- a/src/renderers/shared/server/ReactPartialRenderer.js
+++ b/src/renderers/shared/server/ReactPartialRenderer.js
@@ -168,15 +168,7 @@ function warnNoop(
     var constructor = publicInstance.constructor;
     const currentComponent =
       (constructor && getComponentName(constructor)) || 'ReactClass';
-    const currentComponentError =
-      callerName +
-      '(...): Can only update a mounting component. ' +
-      'This usually means you called ' +
-      callerName +
-      '() outside componentWillMount() on the server. ' +
-      'This is a no-op.\n\nPlease check the code for the ' +
-      currentComponent +
-      ' component.';
+    const currentComponentError = `${callerName}_${currentComponent}`;
 
     warning(
       !!errorInfo[currentComponentError],