diff --git a/misc/background_jobs_worker.pl b/misc/background_jobs_worker.pl
index add96711c2..4eb191de47 100755
--- a/misc/background_jobs_worker.pl
+++ b/misc/background_jobs_worker.pl
@@ -157,23 +157,13 @@ while (1) {
     }
 }
 $conn->disconnect;
+$pm->wait_all_children;
 
 sub process_job {
     my ( $job, $args ) = @_;
-
-    my $pid;
-    if ( $pid = fork ) {
-        wait;
-        return;
-    }
-
-    die "fork failed!" unless defined $pid;
-
     try {
         $job->process( $args );
     } catch {
         $job->status('failed')->store;
     };
-
-    exit;
 }