diff --git a/src/isomorphic/ReactDebugTool.js b/src/isomorphic/ReactDebugTool.js
index 4d2c2a3536a..d5bc1c60bff 100644
--- a/src/isomorphic/ReactDebugTool.js
+++ b/src/isomorphic/ReactDebugTool.js
@@ -55,8 +55,8 @@ var ReactDebugTool = {
   onEndProcessingChildContext() {
     emitEvent('onEndProcessingChildContext');
   },
-  onSetState() {
-    emitEvent('onSetState');
+  onSetState(componentInstance) {
+    emitEvent('onSetState', componentInstance);
   },
   onMountRootComponent(internalInstance) {
     emitEvent('onMountRootComponent', internalInstance);
diff --git a/src/isomorphic/modern/class/ReactComponent.js b/src/isomorphic/modern/class/ReactComponent.js
index a775abd67dd..10c85d2fc12 100644
--- a/src/isomorphic/modern/class/ReactComponent.js
+++ b/src/isomorphic/modern/class/ReactComponent.js
@@ -67,7 +67,7 @@ ReactComponent.prototype.setState = function(partialState, callback) {
     'function which returns an object of state variables.'
   );
   if (__DEV__) {
-    ReactInstrumentation.debugTool.onSetState();
+    ReactInstrumentation.debugTool.onSetState(this);
     warning(
       partialState != null,
       'setState(...): You passed an undefined or null state object; ' +