diff --git a/docs/docs/conditional-rendering.md b/docs/docs/conditional-rendering.md
index c737206295..ea1be02a4c 100644
--- a/docs/docs/conditional-rendering.md
+++ b/docs/docs/conditional-rendering.md
@@ -238,3 +238,5 @@ ReactDOM.render(
 ```
 
 [Try it on CodePen.](https://codepen.io/gaearon/pen/Xjoqwm?editors=0010)
+
+Returning `null` from a component's `render` method does not affect the firing of the component's lifecycle methods. For instance, `componentWillUpdate` and `componentDidUpdate` will still be called.