diff --git a/src/core/ReactCompositeComponent.js b/src/core/ReactCompositeComponent.js
index b2ed6d8810..f1fe60e850 100644
--- a/src/core/ReactCompositeComponent.js
+++ b/src/core/ReactCompositeComponent.js
@@ -798,6 +798,7 @@ var ReactCompositeComponentMixin = {
         var thisID = this._rootNodeID;
         var currentComponentID = currentComponent._rootNodeID;
         currentComponent.unmountComponent();
+        this._renderedComponent = nextComponent;
         var nextMarkup = nextComponent.mountComponent(
           thisID,
           transaction,
@@ -807,7 +808,6 @@ var ReactCompositeComponentMixin = {
           currentComponentID,
           nextMarkup
         );
-        this._renderedComponent = nextComponent;
       }
     }
   ),