diff --git a/addon/services/modals.js b/addon/services/modals.js
index 4c87908a..5e0d800e 100644
--- a/addon/services/modals.js
+++ b/addon/services/modals.js
@@ -37,6 +37,10 @@ export default Service.extend({
     this._stack = A([]);
   },
 
+  willDestroy() {
+    this._onLastModalRemoved();
+  },
+
   open(name, data) {
     let modal = new Modal(this, name, data);
     this._stack.pushObject(modal);