diff --git a/api/src/main/java/marquez/db/JobDao.java b/api/src/main/java/marquez/db/JobDao.java
index 7b4c086e4d..5accf7afac 100644
--- a/api/src/main/java/marquez/db/JobDao.java
+++ b/api/src/main/java/marquez/db/JobDao.java
@@ -282,8 +282,8 @@ default List<Job> findAllWithRun(
         .peek(
             j -> {
               List<Run> runs =
-                  runDao.findByLatestJob(
-                      j.getNamespace().getValue(), j.getName().getValue(), 10, 0);
+                  runDao.findCurrentRunByJob(
+                      j.getNamespace().getValue(), j.getName().getValue(), 1, 0);
               this.setJobData(runs, j);
             })
         .toList();
diff --git a/api/src/main/java/marquez/db/RunDao.java b/api/src/main/java/marquez/db/RunDao.java
index ff67da7bde..ce8440032c 100644
--- a/api/src/main/java/marquez/db/RunDao.java
+++ b/api/src/main/java/marquez/db/RunDao.java
@@ -511,13 +511,31 @@ default RunRow upsertRunMeta(
       BASE_FIND_RUN_SQL
           + """
       WHERE r.uuid IN (
-        SELECT r.uuid FROM runs_view r
-        INNER JOIN jobs_view j ON j.namespace_name=r.namespace_name AND j.name=r.job_name
+        SELECT j.current_run_uuid FROM jobs_view j
         WHERE j.namespace_name=:namespace AND (j.name=:jobName OR j.name=ANY(j.aliases))
       )
       ORDER BY transitioned_at DESC, started_at DESC
       LIMIT :limit OFFSET :offset
       """)
+  List<Run> findCurrentRunByJob(String namespace, String jobName, int limit, int offset);
+
+  @SqlQuery(
+      BASE_FIND_RUN_SQL
+          + """
+      WHERE r.job_uuid IN (
+        SELECT j.uuid FROM jobs j
+        WHERE j.uuid IN (
+          SELECT jv.uuid FROM jobs_view jv
+          WHERE jv.namespace_name=:namespace AND (jv.name=:jobName OR jv.name=ANY(jv.aliases))
+        )
+        OR j.symlink_target_uuid IN (
+          SELECT jv.uuid FROM jobs_view jv
+          WHERE jv.namespace_name=:namespace AND (jv.name=:jobName OR jv.name=ANY(jv.aliases))
+        )
+      )
+      ORDER BY transitioned_at DESC, started_at DESC
+      LIMIT :limit OFFSET :offset
+      """)
   List<Run> findByLatestJob(String namespace, String jobName, int limit, int offset);
 
   @Builder