diff --git a/mutalyzer/Db.py b/mutalyzer/Db.py
index 6a40eba8e3eeb5c8a463ff8230bfae55a476cd19..a5d58becc2c1c4e7fcfcd5595d92fb5f8d8d2cb8 100644
--- a/mutalyzer/Db.py
+++ b/mutalyzer/Db.py
@@ -1493,13 +1493,13 @@ class Batch(Db) :
 
         # To optimize this query, make sure to have two indices on the
         # table:
-        # - UNIQUE KEY (QueueID)
-        # - KEY (JobID, QueueID)
+        # - UNIQUE INDEX (QueueID)
+        # - INDEX (JobID, QueueID)
         statement = """
             SELECT QueueID, Input, Flags
             FROM BatchQueue
             WHERE QueueID = (
-                SELECT QueueID
+                SELECT MIN(QueueID)
                 FROM BatchQueue
                 GROUP BY JobID
                 HAVING JobID = %s