diff --git a/asset-bundles.json b/asset-bundles.json
index 8c2047f..2dd2c67 100644
--- a/asset-bundles.json
+++ b/asset-bundles.json
@@ -2,7 +2,8 @@
     "bundle": {
         "js/admin": {
             "scripts": [
-                "uf-tweaks/js/handlebars-helpers.js"
+                "uf-tweaks/js/handlebars-helpers.js",
+                "uf-tweaks/js/modal-error-handler.js"
             ],
             "options": {
                 "sprinkle": {
diff --git a/assets/uf-tweaks/js/modal-error-handler.js b/assets/uf-tweaks/js/modal-error-handler.js
new file mode 100644
index 0000000..2f17e51
--- /dev/null
+++ b/assets/uf-tweaks/js/modal-error-handler.js
@@ -0,0 +1,16 @@
+
+/**
+ * Default handling of UF modal error
+ *
+ * This script depends on uf-modal.js
+ *
+ * Target page: *
+ */
+
+$(document).ready(function() {
+    const handleModalError = function() {
+        $(this).ufModal('destroy');
+        $('body').on('renderError.ufModal', handleModalError);
+    }
+    $('body').on('renderError.ufModal', handleModalError);
+});