diff --git a/src/orca-loader/LoaderPaymentElement.res b/src/orca-loader/LoaderPaymentElement.res
index a09d0e8d..add7383b 100644
--- a/src/orca-loader/LoaderPaymentElement.res
+++ b/src/orca-loader/LoaderPaymentElement.res
@@ -92,12 +92,14 @@ let make = (
           "onEscape",
         )
       | CompleteDoThis =>
-        eventHandlerFunc(
-          ev => ev.data.completeDoThis,
-          eventHandler,
-          CompleteDoThis,
-          "onCompleteDoThis",
-        )
+        if eventHandler->Option.isSome {
+          eventHandlerFunc(
+            ev => ev.data.completeDoThis,
+            eventHandler,
+            CompleteDoThis,
+            "onCompleteDoThis",
+          )
+        }
       | Change =>
         eventHandlerFunc(
           ev => ev.data.elementType === componentType,