diff --git a/src/main/java/com/interplug/qcast/batch/JobLauncherController.java b/src/main/java/com/interplug/qcast/batch/JobLauncherController.java
index 438bb19e..bb529e5d 100644
--- a/src/main/java/com/interplug/qcast/batch/JobLauncherController.java
+++ b/src/main/java/com/interplug/qcast/batch/JobLauncherController.java
@@ -32,8 +32,6 @@ public class JobLauncherController {
   @Value("${spring.profiles.scheduler}")
   private String scheduler;
 
-  // 현재 실행 중인 Job 추적을 위한 Set
-  private final Set<String> runningJobs = ConcurrentHashMap.newKeySet();
   /**
    * 특정 Job을 매핑으로 실행하는 메소드
    *
@@ -59,31 +57,35 @@ public class JobLauncherController {
       return resultMap;
     }
 
-    // 실행 중인 Job 확인
-    if (runningJobs.contains(jobName) || isJobRunning(jobName)) {
+    // 실행 중인 Job 확인 (데이터베이스 기반)
+    if (isJobRunning(jobName)) {
       log.warn("Job {} is already running, skipping execution", jobName);
       resultMap.put("code", "FAILED");
       resultMap.put("message", "Job "+ jobName +" is already running, skipping execution");
       return resultMap;
     }
 
+    try {
+      log.info("Starting job: {}", jobName);
 
-    JobParameters jobParameters = new JobParametersBuilder().addString("jobName", jobName)
-        .addDate("time", new Date()).toJobParameters();
+      JobParameters jobParameters = new JobParametersBuilder().addString("jobName", jobName)
+          .addDate("time", new Date()).toJobParameters();
 
-    JobExecution jobExecution = jobLauncher.run(job, jobParameters);
+      JobExecution jobExecution = jobLauncher.run(job, jobParameters);
 
+      BatchStatus status = jobExecution.getStatus();
+      ExitStatus exitStatus = jobExecution.getExitStatus();
 
+      resultMap.put("code", status.toString());
+      resultMap.put("message", exitStatus.getExitDescription());
 
-    BatchStatus status = jobExecution.getStatus();
-    ExitStatus exitStatus = jobExecution.getExitStatus();
-
-    resultMap.put("code", status.toString());
-    resultMap.put("message", exitStatus.getExitDescription());
-
-
-    // return "Job " + jobName + " started";
-    return resultMap;
+      // return "Job " + jobName + " started";
+      return resultMap;
+    } catch (Exception e) {
+      resultMap.put("code", "FAILED");
+      resultMap.put("message", e.getMessage());
+      return resultMap;
+    }
   }
 
   /**
@@ -223,8 +225,8 @@ public class JobLauncherController {
       return "Scheduler disabled";
     }
 
-    // 실행 중인 Job 확인
-    if (runningJobs.contains(jobName) || isJobRunning(jobName)) {
+    // 실행 중인 Job 확인 (데이터베이스 기반)
+    if (isJobRunning(jobName)) {
       log.warn("Job {} is already running, skipping execution", jobName);
       return "Job already running";
     }