diff --git a/js/bootstrap-modal.js b/js/bootstrap-modal.js
index b5ffa95b3b7639607a279d06b3e5e1c584acb5b4..205bc261493f570ec102ce7b9e972ac013fb6417 100644
--- a/js/bootstrap-modal.js
+++ b/js/bootstrap-modal.js
@@ -148,8 +148,10 @@
       }
 
     , removeBackdrop: function () {
-        this.$backdrop.remove()
-        this.$backdrop = null
+        if (this.$backdrop) {
+          this.$backdrop.remove()
+          this.$backdrop = null
+        }
       }
 
     , backdrop: function (callback) {
diff --git a/js/tests/unit/bootstrap-modal.js b/js/tests/unit/bootstrap-modal.js
index 98aa990a67a14b47f07604c1316fcfd364b3ce78..c8b99ba7787b80a0f82253a427989904ab9dc120 100644
--- a/js/tests/unit/bootstrap-modal.js
+++ b/js/tests/unit/bootstrap-modal.js
@@ -115,6 +115,8 @@ $(function () {
             div.remove()
             start()
           })
-          .modal("toggle")
+
+        div.modal("toggle")
+        div.modal({backdrop: false}).modal("toggle")
       })
-})
\ No newline at end of file
+})