diff --git a/dear_petition/petition/types/dismissed.py b/dear_petition/petition/types/dismissed.py
index 738ecff2..856b1721 100644
--- a/dear_petition/petition/types/dismissed.py
+++ b/dear_petition/petition/types/dismissed.py
@@ -10,7 +10,7 @@
 def get_offense_records(batch, jurisdiction=""):
     qs = OffenseRecord.objects.filter(offense__ciprs_record__batch=batch)
     if jurisdiction:
-        qs = qs.filter(offense__ciprs_record__jurisdiction=jurisdiction)
+        qs = qs.filter(offense__jurisdiction=jurisdiction)
     qs = qs.filter(build_query()).exclude(severity="INFRACTION")
     return qs.select_related("offense__ciprs_record__batch")
 
diff --git a/dear_petition/petition/types/main.py b/dear_petition/petition/types/main.py
index eaf23485..9a433ff9 100644
--- a/dear_petition/petition/types/main.py
+++ b/dear_petition/petition/types/main.py
@@ -30,10 +30,10 @@ def petition_offense_records(batch, petition_type, jurisdiction=""):
 
 def identify_distinct_petitions(offense_records):
     qs = offense_records.values(
-        "offense__ciprs_record__jurisdiction", "offense__ciprs_record__county"
+        "offense__jurisdiction", "offense__ciprs_record__county"
     )
     qs = qs.values(
-        jurisdiction=F("offense__ciprs_record__jurisdiction"),
+        jurisdiction=F("offense__jurisdiction"),
         county=F("offense__ciprs_record__county"),
     ).distinct()
     logger.info(f"Distinct petitions: {list(qs.values_list('county', 'jurisdiction'))}")
diff --git a/dear_petition/petition/types/not_guilty.py b/dear_petition/petition/types/not_guilty.py
index 57612c0c..d5b56ae4 100644
--- a/dear_petition/petition/types/not_guilty.py
+++ b/dear_petition/petition/types/not_guilty.py
@@ -8,7 +8,7 @@
 def get_offense_records(batch, jurisdiction=""):
     qs = OffenseRecord.objects.filter(offense__ciprs_record__batch=batch)
     if jurisdiction:
-        qs = qs.filter(offense__ciprs_record__jurisdiction=jurisdiction)
+        qs = qs.filter(offense__jurisdiction=jurisdiction)
     query = build_query()
     qs = qs.filter(query).exclude(severity="INFRACTION")
     return qs.select_related("offense__ciprs_record__batch")
diff --git a/dear_petition/petition/types/tests/test_dismissed.py b/dear_petition/petition/types/tests/test_dismissed.py
index a3a3d24e..94676ac8 100644
--- a/dear_petition/petition/types/tests/test_dismissed.py
+++ b/dear_petition/petition/types/tests/test_dismissed.py
@@ -68,6 +68,7 @@ def test_offense_records_by_jurisdiction(batch, jurisdiction):
     offense = OffenseFactory(
         disposition_method=constants.CIPRS_DISPOSITION_METHODS_DISMISSED[0],
         ciprs_record=ciprs_record,
+        jurisdiction=jurisdiction,
     )
     offense_record = OffenseRecordFactory(action="CHARGED", offense=offense)
     records = batch.dismissed_offense_records(jurisdiction=jurisdiction)
diff --git a/dear_petition/petition/types/tests/test_distinct_petitions.py b/dear_petition/petition/types/tests/test_distinct_petitions.py
index 8f29bae6..3b79acff 100644
--- a/dear_petition/petition/types/tests/test_distinct_petitions.py
+++ b/dear_petition/petition/types/tests/test_distinct_petitions.py
@@ -27,8 +27,10 @@ def test_distinct_petition__many(batch):
     method = constants.CIPRS_DISPOSITION_METHODS_DISMISSED[0]
     for jurisdiction in [constants.DISTRICT_COURT, constants.SUPERIOR_COURT]:
         for county in ["DURHAM", "WAKE"]:
-            record = CIPRSRecordFactory(jurisdiction=jurisdiction, county=county, batch=batch)
-            offense = OffenseFactory(disposition_method=method, ciprs_record=record)
+            record = CIPRSRecordFactory(
+                jurisdiction=jurisdiction, county=county, batch=batch
+            )
+            offense = OffenseFactory(disposition_method=method, ciprs_record=record, jurisdiction=jurisdiction,)
             OffenseRecordFactory(action="CHARGED", offense=offense)
     petition_types = identify_distinct_petitions(batch.dismissed_offense_records())
     assert petition_types.count() == 4
diff --git a/dear_petition/petition/types/underaged_convictions.py b/dear_petition/petition/types/underaged_convictions.py
index 6fcbdaa1..0d1af5be 100644
--- a/dear_petition/petition/types/underaged_convictions.py
+++ b/dear_petition/petition/types/underaged_convictions.py
@@ -28,7 +28,7 @@ def get_offense_records(batch, jurisdiction=""):
         )  # We can't determine this petition type without the date of birth
 
     if jurisdiction:
-        qs = qs.filter(offense__ciprs_record__jurisdiction=jurisdiction)
+        qs = qs.filter(offense__jurisdiction=jurisdiction)
 
     query = build_query(dob)
     qs = qs.filter(query).exclude(severity="INFRACTION")