diff --git a/js/webform.element.managed_file.js b/js/webform.element.managed_file.js
index b005a7d1e..ae782bd5d 100644
--- a/js/webform.element.managed_file.js
+++ b/js/webform.element.managed_file.js
@@ -71,7 +71,8 @@
     },
     detach: function detach(context, settings, trigger) {
       if (trigger === 'unload') {
-        $(context).find('input[type="file"]').removeOnce('webform-auto-file-upload').each(function () {
+         const removedElements = once.remove('webform-auto-file-upload', 'input[type="file"]', context);
+        $(removedElements).each(function () {
           if ($(this).data('webform-auto-file-upload')) {
             // Remove file upload tracking.
             $(this).removeData('webform-auto-file-upload');
