diff --git a/CHANGELOG_DEV.md b/CHANGELOG_DEV.md
index 3b2d35b2f1..11d03cabd2 100644
--- a/CHANGELOG_DEV.md
+++ b/CHANGELOG_DEV.md
@@ -56,3 +56,4 @@ HumHub Changelog
 - Enh #3889: Prevent automatically resized site icons by manually added files (e.g. `/upload/icon/180x180.png`)
 - Enh #4458: Remove cacert.pem in order to avoid curl error
 - Fix #4473: Catch all Throwables when loading module configuration
+- Fix #4474: Loader not removed from event trigger
diff --git a/static/js/humhub/humhub.action.js b/static/js/humhub/humhub.action.js
index 41d2f237cb..25948043ea 100644
--- a/static/js/humhub/humhub.action.js
+++ b/static/js/humhub/humhub.action.js
@@ -719,6 +719,7 @@ humhub.module('action', function(module, require, $) {
 
         var that = this;
         event.finish = function() {
+            _removeLoaderFromEventTarget(event);
             _removeLoaderFromEventTarget(event.originalEvent);
             that.unblock($trigger);
         };
@@ -734,6 +735,10 @@ humhub.module('action', function(module, require, $) {
         if(evt && evt.target) {
             loader.reset(evt.target);
         }
+
+        if(evt && evt.$trigger) {
+            loader.reset(evt.$trigger);
+        }
     };