diff --git a/src/Modal.js b/src/Modal.js
index 1cf3ee7c..6a65d43c 100644
--- a/src/Modal.js
+++ b/src/Modal.js
@@ -276,7 +276,9 @@ const Modal = React.createClass({
   },
 
   componentWillUnmount() {
-    if (this.props.show) {
+    let { show, transition } = this.props;
+
+    if (show || (transition && !this.state.exited)) {
       this.onHide();
     }
   },