diff --git a/server/entertainment_decider/extractors/collection/tt_rss.py b/server/entertainment_decider/extractors/collection/tt_rss.py
index e2c11f0..d1d28bd 100644
--- a/server/entertainment_decider/extractors/collection/tt_rss.py
+++ b/server/entertainment_decider/extractors/collection/tt_rss.py
@@ -8,7 +8,7 @@ from pony import orm  # TODO remove
 
 from ...models import MediaCollection
 from ..all.tt_rss import HeadlineList, TtRssConnectionParameter, TtRssUri
-from ..generic import ExtractedData, SuitableLevel
+from ..generic import ExtractedData, ExtractedDataLight, SuitableLevel
 from .base import CollectionExtractor
 
 
@@ -41,8 +41,8 @@ class TtRssCollectionExtractor(CollectionExtractor[HeadlineList]):
     def _cache_expired(self, object: MediaCollection) -> bool:
         return (datetime.now() - object.last_updated) > timedelta(minutes=15)
 
-    def _extract_offline(self, uri: str) -> ExtractedData[HeadlineList]:
-        return ExtractedData(
+    def _extract_offline(self, uri: str) -> ExtractedDataLight:
+        return ExtractedDataLight(
             extractor_name=self.name,
             object_key=uri,
             object_uri=uri,
diff --git a/server/entertainment_decider/extractors/collection/youtube.py b/server/entertainment_decider/extractors/collection/youtube.py
index 67a6c53..f2afb74 100644
--- a/server/entertainment_decider/extractors/collection/youtube.py
+++ b/server/entertainment_decider/extractors/collection/youtube.py
@@ -9,7 +9,7 @@ from pony import orm  # TODO remove
 import youtubesearchpython
 
 from ...models import MediaCollection
-from ..generic import ExtractedData, SuitableLevel
+from ..generic import ExtractedData, ExtractedDataLight, SuitableLevel
 from .base import CollectionExtractor
 
 
@@ -59,9 +59,9 @@ class YouTubeCollectionExtractor(CollectionExtractor[Dict]):
             last_release_date
         )
 
-    def _extract_offline(self, uri: str) -> ExtractedData[Dict]:
+    def _extract_offline(self, uri: str) -> ExtractedDataLight:
         playlist_id = self.__convert_if_required(self.__get_id(uri))
-        return ExtractedData(
+        return ExtractedDataLight(
             extractor_name=self.name,
             object_key=playlist_id,
             object_uri=uri,
diff --git a/server/entertainment_decider/extractors/generic.py b/server/entertainment_decider/extractors/generic.py
index 3bbcd88..039ed12 100644
--- a/server/entertainment_decider/extractors/generic.py
+++ b/server/entertainment_decider/extractors/generic.py
@@ -67,7 +67,7 @@ class ExtractedDataLight:
 
 @dataclass
 class ExtractedData(ExtractedDataLight, Generic[T]):
-    data: T = dataclasses.field(default=None, repr=False, compare=False)
+    data: T = dataclasses.field(repr=False, compare=False)
 
     @property
     def has_data(self) -> bool:
@@ -128,7 +128,7 @@ class GeneralExtractor(Generic[E, T]):
     def _cache_expired(self, object: E) -> bool:
         return False
 
-    def _extract_offline_only(self, uri: str) -> ExtractedData[T]:
+    def _extract_offline_only(self, uri: str) -> ExtractedDataLight:
         raise NotImplementedError()
 
     def _extract_online(self, uri: str) -> ExtractedData[T]:
@@ -142,7 +142,7 @@ class GeneralExtractor(Generic[E, T]):
 
     # defined
 
-    def _extract_offline(self, uri: str) -> ExtractedData[T]:
+    def _extract_offline(self, uri: str) -> ExtractedDataLight:
         return (
             self._extract_offline_only(uri)
             if self.can_extract_offline(uri)