diff --git a/src/extractor/ExtractorRegistry.ts b/src/extractor/ExtractorRegistry.ts
index 7dd7c64..7a5b58b 100644
--- a/src/extractor/ExtractorRegistry.ts
+++ b/src/extractor/ExtractorRegistry.ts
@@ -54,7 +54,15 @@ export class ExtractorRegistry {
 
     this.logger.info(`Extract ${url} using ${extractor.id} extractor`, ctx);
 
-    const urlResults = await extractor.extract(ctx, normalizedUrl, { ...meta, countryCodes: meta?.countryCodes ?? [], extractorId: extractor.id });
+    const urlResults = await extractor.extract(
+      ctx,
+      normalizedUrl,
+      {
+        ...meta,
+        countryCodes: meta?.countryCodes ?? [],
+        extractorId: meta?.extractorId ?? extractor.id,
+      },
+    );
 
     if (!urlResults.length) {
       await this.urlResultCache.set<UrlResult[]>(cacheKey, urlResults, 43200000); // 12h
diff --git a/src/extractor/HubCloud.ts b/src/extractor/HubCloud.ts
index 8fd03a1..9722a7f 100644
--- a/src/extractor/HubCloud.ts
+++ b/src/extractor/HubCloud.ts
@@ -36,11 +36,11 @@ export class HubCloud extends Extractor {
             url,
             format: Format.unknown,
             label: `${this.label} (FSL)`,
-            sourceId: `${this.id}_fsl`,
             ttl: this.ttl,
             meta: {
               ...meta,
               bytes: bytes.parse($('#size').text()) as number,
+              extractorId: `${this.id}_fsl`,
               title: $('title').text().trim(),
             },
           };
@@ -53,11 +53,11 @@ export class HubCloud extends Extractor {
             url,
             format: Format.unknown,
             label: `${this.label} (PixelServer)`,
-            sourceId: `${this.id}_pixelserver`,
             ttl: this.ttl,
             meta: {
               ...meta,
               bytes: bytes.parse($('#size').text()) as number,
+              extractorId: `${this.id}_pixelserver`,
               title: $('title').text().trim(),
             },
           };
diff --git a/src/extractor/__snapshots__/HubCloud.test.ts.snap b/src/extractor/__snapshots__/HubCloud.test.ts.snap
index 853ca86..3048fea 100644
--- a/src/extractor/__snapshots__/HubCloud.test.ts.snap
+++ b/src/extractor/__snapshots__/HubCloud.test.ts.snap
@@ -8,10 +8,9 @@ exports[`HubCloud handle crayon shin-chan 1993 1`] = `
     "meta": {
       "bytes": 28550795100,
       "countryCodes": [],
-      "extractorId": "hubcloud",
+      "extractorId": "hubcloud_fsl",
       "title": "Crayon Shinchan Action Kamen vs Demon (1993) 1080p BluRay REMUX AVC [Hindi DD 2.0 + Japanese FLAC 2.0] (PitiPati-Ionicboy) (4kHDHub.com).mkv",
     },
-    "sourceId": "hubcloud_fsl",
     "ttl": 259200000,
     "url": "https://pub-6b25c191839c4b01a878de4fdde0227b.r2.dev/e35ec4a9a4efb5a154d0d10f9481dafc?token=1765557445",
   },
@@ -26,10 +25,9 @@ exports[`HubCloud handle dark 2017 s03e08 1`] = `
     "meta": {
       "bytes": 3382286745,
       "countryCodes": [],
-      "extractorId": "hubcloud",
+      "extractorId": "hubcloud_pixelserver",
       "title": "Dark.S03E08.The.Paradise.1080p.NF.WEB-DL.English.DDP5.1-German.DDP5.1.H.264-4kHdHub.Com.mkv",
     },
-    "sourceId": "hubcloud_pixelserver",
     "ttl": 259200000,
     "url": "https://pixeldrain.dev/api/file/2kFQBQio",
   },
@@ -44,10 +42,9 @@ exports[`HubCloud handle dexter original sin 2024 s01e01 1`] = `
     "meta": {
       "bytes": 5733781340,
       "countryCodes": [],
-      "extractorId": "hubcloud",
+      "extractorId": "hubcloud_fsl",
       "title": "Dexter.Original.Sin.S01E01.2160p.SKST.WEB-DL.H.265.DDP5.1-Tyrell.mkv",
     },
-    "sourceId": "hubcloud_fsl",
     "ttl": 259200000,
     "url": "https://pub-b5ecaffddf2344a0ae2222f5e8913e1b.r2.dev/Dexter.Original.Sin.S01E01.2160p.SKST.WEB-DL.H.265.DDP5.1-Tyrell.mkv?token=1765557444",
   },
@@ -57,10 +54,9 @@ exports[`HubCloud handle dexter original sin 2024 s01e01 1`] = `
     "meta": {
       "bytes": 5733781340,
       "countryCodes": [],
-      "extractorId": "hubcloud",
+      "extractorId": "hubcloud_pixelserver",
       "title": "Dexter.Original.Sin.S01E01.2160p.SKST.WEB-DL.H.265.DDP5.1-Tyrell.mkv",
     },
-    "sourceId": "hubcloud_pixelserver",
     "ttl": 259200000,
     "url": "https://pixeldrain.dev/api/file/HqAiguQV",
   },