diff --git a/js/src/dom/eventHandler.js b/js/src/dom/eventHandler.js
index 65c671facd41f4e74f85b06f44ae0d201f837274..9a1e3709214c49b9e8c452a7d3e30727cdf86a46 100644
--- a/js/src/dom/eventHandler.js
+++ b/js/src/dom/eventHandler.js
@@ -136,10 +136,7 @@ function bootstrapDelegationHandler(element, selector, fn) {
 }
 
 function findHandler(events, handler, delegationSelector = null) {
-  const uidList = Object.keys(events)
-
-  for (let i = 0; i < uidList.length; i++) {
-    const uid = uidList[i]
+  for (const uid of Object.keys(events)) {
     const event = events[uid]
 
     if (event.originalHandler === handler && event.delegationSelector === delegationSelector) {