diff --git a/src/Modal.js b/src/Modal.js
index d07ca90a6..ccd19f9b8 100644
--- a/src/Modal.js
+++ b/src/Modal.js
@@ -153,7 +153,7 @@ class Modal extends React.Component {
 
     if (this._element) {
       this.destroy();
-      if (this.props.isOpen) {
+      if (this.props.isOpen || this.state.isOpen) {
         this.close();
       }
     }