diff --git a/src/filed/fd_plugins.c b/src/filed/fd_plugins.c
index 36e9c31f41f..55aa5acbcf1 100644
--- a/src/filed/fd_plugins.c
+++ b/src/filed/fd_plugins.c
@@ -235,11 +235,17 @@ static inline bool trigger_plugin_event(JCR *jcr, bEventType eventType,
 
    if (!is_event_enabled(ctx, eventType)) {
       Dmsg1(dbglvl, "Event %d disabled for this plugin.\n", eventType);
+      if (rc) {
+         *rc = bRC_OK;
+      }
       goto bail_out;
    }
 
    if (is_plugin_disabled(ctx)) {
-      return bRC_OK;
+      if (rc) {
+         *rc = bRC_OK;
+      }
+      goto bail_out;
    }
 
    if (eventType == bEventEndRestoreJob) {