diff --git a/apps/api/src/controllers/crawl-status.ts b/apps/api/src/controllers/crawl-status.ts
index e1528712..b284fc70 100644
--- a/apps/api/src/controllers/crawl-status.ts
+++ b/apps/api/src/controllers/crawl-status.ts
@@ -4,6 +4,7 @@ import { RateLimiterMode } from "../../src/types";
 import { getScrapeQueue } from "../../src/services/queue-service";
 import { Logger } from "../../src/lib/logger";
 import { getCrawl, getCrawlJobs } from "../../src/lib/crawl-redis";
+import { supabaseGetJobById } from "../../src/lib/supabase-jobs";
 
 export async function crawlStatusController(req: Request, res: Response) {
   try {
@@ -21,18 +22,25 @@ export async function crawlStatusController(req: Request, res: Response) {
       return res.status(404).json({ error: "Job not found" });
     }
 
+    if (sc.team_id !== team_id) {
+      return res.status(403).json({ error: "Forbidden" });
+    }
+
     const jobIDs = await getCrawlJobs(req.params.jobId);
 
-    // let data = job.returnvalue;
-    // if (process.env.USE_DB_AUTHENTICATION === "true") {
-    //   const supabaseData = await supabaseGetJobById(req.params.jobId);
+    const jobs = await Promise.all(jobIDs.map(async x => {
+      const job = await getScrapeQueue().getJob(x);
+      
+      if (process.env.USE_DB_AUTHENTICATION === "true") {
+        const supabaseData = await supabaseGetJobById(job.id);
 
-    //   if (supabaseData) {
-    //     data = supabaseData.docs;
-    //   }
-    // }
+        if (supabaseData) {
+          job.returnvalue = supabaseData.docs;
+        }
+      }
 
-    const jobs = await Promise.all(jobIDs.map(x => getScrapeQueue().getJob(x)));
+      return job;
+    }));
     const jobStatuses = await Promise.all(jobs.map(x => x.getState()));
     const jobStatus = sc.cancelled ? "failed" : jobStatuses.every(x => x === "completed") ? "completed" : jobStatuses.some(x => x === "failed") ? "failed" : "active";
 
diff --git a/apps/api/src/services/queue-worker.ts b/apps/api/src/services/queue-worker.ts
index a57037ec..7aa639dd 100644
--- a/apps/api/src/services/queue-worker.ts
+++ b/apps/api/src/services/queue-worker.ts
@@ -53,7 +53,11 @@ const processJobInternal = async (token: string, job: Job) => {
   try {
     const result = await processJob(job, token);
     try{
-      await job.moveToCompleted(result.docs, token, false);
+      if (job.data.crawl_id && process.env.USE_DB_AUTHENTICATION === "true") {
+        await job.moveToCompleted(null, token, false);
+      } else {
+        await job.moveToCompleted(result.docs, token, false);
+      }
     }catch(e){
     }
   } catch (error) {