diff --git a/apps/api/src/controllers/v1/crawl-status.ts b/apps/api/src/controllers/v1/crawl-status.ts
index 67991d77..bbaa7ab5 100644
--- a/apps/api/src/controllers/v1/crawl-status.ts
+++ b/apps/api/src/controllers/v1/crawl-status.ts
@@ -53,8 +53,10 @@ export async function crawlStatusController(req: RequestWithAuth<CrawlStatusPara
       used++;
     }
 
-    doneJobs.splice(doneJobs.length - 1, 1);
-    used--;
+    if (used < doneJobsOrder.length) {
+      doneJobs.splice(doneJobs.length - 1, 1);
+      used--;
+    }
   } else {
     doneJobs = (await Promise.all(doneJobsOrder.map(async x => await getJob(x))));
   }
diff --git a/apps/api/src/lib/crawl-redis.ts b/apps/api/src/lib/crawl-redis.ts
index 9d8802c7..3f326811 100644
--- a/apps/api/src/lib/crawl-redis.ts
+++ b/apps/api/src/lib/crawl-redis.ts
@@ -28,8 +28,9 @@ export async function getCrawl(id: string): Promise<StoredCrawl | null> {
 
 export async function getCrawlExpiry(id: string): Promise<Date> {
     const d = new Date();
-    const ttl = await redisConnection.ttl(id);
-    d.setSeconds(d.getSeconds() + ttl);
+    const ttl = await redisConnection.pttl("crawl:" + id);
+    d.setMilliseconds(d.getMilliseconds() + ttl);
+    d.setMilliseconds(0);
     return d;
 }