diff --git a/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Indictment/lib/getDeprecatedIncidentDescriptionReason.ts b/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Indictment/lib/getDeprecatedIncidentDescriptionReason.ts
index 25936a981cb3c..bc5da0ef8d0ec 100644
--- a/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Indictment/lib/getDeprecatedIncidentDescriptionReason.ts
+++ b/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Indictment/lib/getDeprecatedIncidentDescriptionReason.ts
@@ -8,7 +8,7 @@ import {
 
 import { getRelevantSubstances } from '../IndictmentCount'
 import { indictmentCount as strings } from '../IndictmentCount.strings'
-import { substanceEnum } from '../Substances/SubstancesEnum.strings'
+import { indictmentCountSubstanceEnum as substanceStrings } from '../IndictmentCountSubstanceEnum.strings'
 
 export const getDeprecatedIncidentDescriptionReason = (
   deprecatedOffenses: IndictmentCountOffense[],
@@ -77,7 +77,7 @@ export const getDeprecatedIncidentDescriptionReason = (
     } else {
       acc += ', '
     }
-    acc += formatMessage(substanceEnum[substance[0] as Substance], {
+    acc += formatMessage(substanceStrings[substance[0] as Substance], {
       amount: substance[1],
     })
     if (index === relevantSubstances.length - 1) {
diff --git a/apps/judicial-system/web/src/utils/validate.ts b/apps/judicial-system/web/src/utils/validate.ts
index 283d3cb209ed2..1718ba8620357 100644
--- a/apps/judicial-system/web/src/utils/validate.ts
+++ b/apps/judicial-system/web/src/utils/validate.ts
@@ -290,7 +290,10 @@ export const isProcessingStepValidIndictments = (
   )
 }
 
-export const isIndictmentStepValid = (workingCase: Case): boolean => {
+export const isIndictmentStepValid = (
+  workingCase: Case,
+  isOffenseEndpointEnabled: boolean,
+): boolean => {
   const hasValidDemands = Boolean(
     workingCase.demands &&
       (!workingCase.hasCivilClaims || workingCase.civilDemands),
@@ -318,6 +321,10 @@ export const isIndictmentStepValid = (workingCase: Case): boolean => {
   }
 
   const hasOffenses = (indictmentCount: IndictmentCount) => {
+    if (!isOffenseEndpointEnabled) {
+      return true
+    }
+
     if (indictmentCount.offenses) {
       return Boolean(
         indictmentCount.offenses && indictmentCount.offenses?.length > 0,
@@ -328,6 +335,7 @@ export const isIndictmentStepValid = (workingCase: Case): boolean => {
         indictmentCount.deprecatedOffenses?.length > 0,
     )
   }
+
   const isValidTrafficViolation = (indictmentCount: IndictmentCount) =>
     Boolean(indictmentCount.policeCaseNumber) &&
     hasOffenses(indictmentCount) &&