diff --git a/src/components/Modal.js b/src/components/Modal.js
index 275c164f..0786f355 100644
--- a/src/components/Modal.js
+++ b/src/components/Modal.js
@@ -127,7 +127,7 @@ export default class Modal extends Component {
   }
 
   componentWillUnmount() {
-    if (!this.node) return;
+    if (!this.node || !this.portal) return;
 
     const state = this.portal.state;
     const now = Date.now();