diff --git a/lib/form/dndupload.js b/lib/form/dndupload.js
index de60baf4ade..ad8654e0ba6 100644
--- a/lib/form/dndupload.js
+++ b/lib/form/dndupload.js
@@ -863,7 +863,8 @@ M.form_dndupload.init = function(Y, options) {
          */
         notifyUploadCompleted: function() {
             require(['core_form/events'], function(FormEvent) {
-                FormEvent.notifyUploadCompleted(this.filemanagerhelper.filemanager.get('id'));
+                const elementId = this.filemanagerhelper ? this.filemanagerhelper.filemanager.get('id') : this.options.containerid;
+                FormEvent.triggerUploadCompleted(elementId);
             }.bind(this));
          },
 
@@ -872,7 +873,8 @@ M.form_dndupload.init = function(Y, options) {
          */
         notifyUploadStarted: function() {
             require(['core_form/events'], function(FormEvent) {
-                FormEvent.notifyUploadStarted(this.filemanagerhelper.filemanager.get('id'));
+                const elementId = this.filemanagerhelper ? this.filemanagerhelper.filemanager.get('id') : this.options.containerid;
+                FormEvent.triggerUploadStarted(elementId);
             }.bind(this));
         },