diff --git a/metadata_catalogue/datasets/managers.py b/metadata_catalogue/datasets/managers.py
index 8a23a3e..30d7cad 100644
--- a/metadata_catalogue/datasets/managers.py
+++ b/metadata_catalogue/datasets/managers.py
@@ -35,7 +35,9 @@ def as_geoapi_resource(self, base_url, *args, warn=True, **kwargs):
         logger.warn("DANGER: This method consumes the queryset and returns and array of items")
         return [
             ResourceMapping(instance, base_url).as_resource()
-            for instance in self.exclude(metadata=None, metadata__bounding_box=None)
+            for instance in self.select_related("metadata", "content").exclude(
+                metadata=None, metadata__bounding_box=None, content=None
+            )
         ]