diff --git a/server/db.js b/server/db.js
index 52ef555..2a4b6fa 100644
--- a/server/db.js
+++ b/server/db.js
@@ -227,7 +227,7 @@ export function importInstances(rows, historyRows = []) {
 
 export function getInstanceHistory(vmid) {
   return db.prepare(
-    'SELECT * FROM instance_history WHERE vmid = ? ORDER BY changed_at DESC'
+    'SELECT * FROM instance_history WHERE vmid = ? ORDER BY changed_at ASC, id ASC'
   ).all(vmid);
 }
 
diff --git a/server/jobs.js b/server/jobs.js
index f6b1a59..dc61d1f 100644
--- a/server/jobs.js
+++ b/server/jobs.js
@@ -132,7 +132,9 @@ const _intervals = new Map();
 export async function runJobsOnCreate() {
   for (const job of getJobs()) {
     const cfg = JSON.parse(job.config || '{}');
-    if (cfg.run_on_create) runJob(job.id).catch(e => console.error(`runJobsOnCreate job ${job.id}:`, e));
+    if (cfg.run_on_create) {
+      try { await runJob(job.id); } catch (e) { console.error(`runJobsOnCreate job ${job.id}:`, e); }
+    }
   }
 }