diff --git a/internal/api/rest.go b/internal/api/rest.go
index eed30b9..78b28af 100644
--- a/internal/api/rest.go
+++ b/internal/api/rest.go
@@ -929,7 +929,7 @@ func (api *RestApi) stopJobByRequest(rw http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	log.Printf("loading db job for stopJobByRequest... : stopJobApiRequest=%#v", req)
+	log.Printf("loading db job for stopJobByRequest... : stopJobApiRequest=%v", req)
 	job, err = api.JobRepository.Find(req.JobId, req.Cluster, req.StartTime)
 
 	if err != nil {
diff --git a/internal/repository/job.go b/internal/repository/job.go
index 54ec6d0..644d427 100644
--- a/internal/repository/job.go
+++ b/internal/repository/job.go
@@ -235,8 +235,10 @@ func (r *JobRepository) Find(
 		q = q.Where("job.start_time = ?", *startTime)
 	}
 
-	s, _, _ := q.ToSql()
-	log.Printf("trying to find db job with query: %s", s)
+	q = q.OrderBy("job.id DESC") // always use newest matching job by db id
+
+	s, args, _ := q.ToSql()
+	log.Printf("trying to find db job with query: %s | %v", s, args)
 
 	log.Debugf("Timer Find %s", time.Since(start))
 	return scanJob(q.RunWith(r.stmtCache).QueryRow())