diff --git a/.gitignore b/.gitignore
index 1f77e9806..4a88e310e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -113,6 +113,7 @@ ENV/
 env.bak/
 docker-compose.override.yml
 settings/envs/docker.override.env
+.envrc
 
 # Spyder project settings
 .spyderproject
diff --git a/commodities/models/dc.py b/commodities/models/dc.py
index f868981ff..e80f0664b 100644
--- a/commodities/models/dc.py
+++ b/commodities/models/dc.py
@@ -1600,8 +1600,7 @@ def _apply_filters(qs: TrackedModelQuerySet):
         goods_sids = Subquery(goods_query.values("sid"))
 
         indents_query = (
-            _apply_filters(GoodsNomenclatureIndent.objects)
-            .with_end_date()
+            _apply_filters(GoodsNomenclatureIndent.objects.with_end_date())
             .filter(indented_goods_nomenclature__sid__in=goods_sids)
             .annotate(goods_sid=F("indented_goods_nomenclature__sid"))
             .order_by("transaction", "validity_start")
diff --git a/commodities/tests/test_commodity_tree_snapshot.py b/commodities/tests/test_commodity_tree_snapshot.py
index 1781bcca8..fa183b7f1 100644
--- a/commodities/tests/test_commodity_tree_snapshot.py
+++ b/commodities/tests/test_commodity_tree_snapshot.py
@@ -92,3 +92,11 @@ def test_get_dependent_measures_works_with_wonky_archived_measure(
     assert wonky_archived_measure.generating_regulation == old_regulation
     assert target_commodity in commodities_collection.commodities
     assert target_commodity in target.commodities
+
+
+def test_commodity_collection_loader(seed_database_with_indented_goods):
+    # Test that 'effective_only' does not crash the code
+    commodities_collection = CommodityCollectionLoader(prefix="2903").load(
+        effective_only=True,
+    )
+    assert len(commodities_collection.commodities) == 6