diff --git a/src/helpers/cms-content-helper.js b/src/helpers/cms-content-helper.js
index d2c3ce97..c8ddf306 100644
--- a/src/helpers/cms-content-helper.js
+++ b/src/helpers/cms-content-helper.js
@@ -532,7 +532,12 @@ export function setupModalLinks(context, abortSignal = null) {
         for (const element of elements) {
             const target = element.getAttribute('modalTarget');
             if (target) {
-                element.addEventListener('click', () => context.$refs[target].openModal(), { signal: abortSignal });
+                if (abortSignal) {
+                    element.addEventListener('click', () => context.$refs[target].openModal(), { signal: abortSignal });
+                }
+                else {
+                    element.addEventListener('click', () => context.$refs[target].openModal());
+                }
             }
         }
     });
@@ -547,7 +552,6 @@ export function setupModalLink(context, desiredTarget) {
     context.$nextTick(() => {
         const element = document.querySelector(`[modalTarget=${desiredTarget}]`);
         if (element) {
-            element.removeEventListener('click', () => context.$refs[desiredTarget].openModal());
             element.addEventListener('click', () => context.$refs[desiredTarget].openModal());
         }
     });