diff --git a/app/Console/Commands/CertificatesOfParticipationGeneration.php b/app/Console/Commands/CertificatesOfParticipationGeneration.php
index 676afc0de..f6ea73224 100644
--- a/app/Console/Commands/CertificatesOfParticipationGeneration.php
+++ b/app/Console/Commands/CertificatesOfParticipationGeneration.php
@@ -28,7 +28,7 @@ class CertificatesOfParticipationGeneration extends Command
     public function handle(): int
     {
 
-        $participations = Participation::whereNull('participation_url')->where('status', '<>', 'ERROR')->orderByDesc('created_at')->get();
+        $participations = Participation::whereNull('participation_url')->where('status', '=', 'PENDING')->orderByDesc('created_at')->get();
 
         $this->info(count($participations).' certificates of participation to generate');
 
diff --git a/app/Jobs/GenerateCertificatesOfParticipation.php b/app/Jobs/GenerateCertificatesOfParticipation.php
index 5c1a77445..4e162e386 100644
--- a/app/Jobs/GenerateCertificatesOfParticipation.php
+++ b/app/Jobs/GenerateCertificatesOfParticipation.php
@@ -33,6 +33,10 @@ public function handle(): void
     {
         $names = array_map('trim', explode(',', $this->participation->names));
 
+        $this->participation['status'] = 'PROCESSING';
+
+        $this->participation->save();
+
         $zipUrl = CertificatesHelper::doGenerateCertificatesOfParticipation($names, $this->participation->event_name, $this->participation->event_date);
 
         $this->participation['participation_url'] = $zipUrl;