diff --git a/efgs-server-service/src/main/java/es/gob/radarcovid/efgs/runner/CleanBatchJobExecutionRunner.java b/efgs-server-service/src/main/java/es/gob/radarcovid/efgs/runner/CleanBatchJobExecutionRunner.java
index 8ccb11a..ffb18d1 100644
--- a/efgs-server-service/src/main/java/es/gob/radarcovid/efgs/runner/CleanBatchJobExecutionRunner.java
+++ b/efgs-server-service/src/main/java/es/gob/radarcovid/efgs/runner/CleanBatchJobExecutionRunner.java
@@ -41,7 +41,6 @@ public void run() {
 		log.info("CleanBatchJobExecutionRunner started");
 		cleanBatchJobService.cleanBatchJobExecution();		
 		log.info("CleanBatchJobExecutionRunner finished");
-		MDC.remove(Constants.TRACKING);
 	}
 
 }
diff --git a/efgs-server-service/src/main/java/es/gob/radarcovid/efgs/runner/DownloadDiagnosisKeysRunner.java b/efgs-server-service/src/main/java/es/gob/radarcovid/efgs/runner/DownloadDiagnosisKeysRunner.java
index d62421b..e20d6ea 100644
--- a/efgs-server-service/src/main/java/es/gob/radarcovid/efgs/runner/DownloadDiagnosisKeysRunner.java
+++ b/efgs-server-service/src/main/java/es/gob/radarcovid/efgs/runner/DownloadDiagnosisKeysRunner.java
@@ -58,7 +58,6 @@ public void run() {
 		}
 
 		log.info("DownloadDiagnosisKeysRunner finished");
-		MDC.remove(Constants.TRACKING);
 	}
 
 }
diff --git a/efgs-server-service/src/main/java/es/gob/radarcovid/efgs/runner/EfgsRunner.java b/efgs-server-service/src/main/java/es/gob/radarcovid/efgs/runner/EfgsRunner.java
index acbdcb2..2189895 100644
--- a/efgs-server-service/src/main/java/es/gob/radarcovid/efgs/runner/EfgsRunner.java
+++ b/efgs-server-service/src/main/java/es/gob/radarcovid/efgs/runner/EfgsRunner.java
@@ -9,9 +9,11 @@
  */
 package es.gob.radarcovid.efgs.runner;
 
+import org.slf4j.MDC;
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
 
+import es.gob.radarcovid.efgs.etc.Constants;
 import lombok.NoArgsConstructor;
 
 @NoArgsConstructor
@@ -20,6 +22,7 @@ public abstract class EfgsRunner implements ApplicationRunner {
 	@Override
 	public void run(ApplicationArguments args) throws Exception {
 		args.getNonOptionArgs().stream().filter(arg -> arg.equals(jobName())).findFirst().ifPresent(arg -> run());
+		MDC.remove(Constants.TRACKING);
 	}
 
 	public abstract String jobName();
diff --git a/efgs-server-service/src/main/java/es/gob/radarcovid/efgs/runner/UploadDiagnosisKeysRunner.java b/efgs-server-service/src/main/java/es/gob/radarcovid/efgs/runner/UploadDiagnosisKeysRunner.java
index 9a087ac..b305dbd 100644
--- a/efgs-server-service/src/main/java/es/gob/radarcovid/efgs/runner/UploadDiagnosisKeysRunner.java
+++ b/efgs-server-service/src/main/java/es/gob/radarcovid/efgs/runner/UploadDiagnosisKeysRunner.java
@@ -59,7 +59,6 @@ public void run() {
 		}
 
 		log.info("UploadDiagnosisKeysRunner finished");
-		MDC.remove(Constants.TRACKING);
 	}
 
 }