diff --git a/src/app/forms/custom-sections/adr-permitted-dangerous-goods/adr-permitted-dangerous-goods.component.ts b/src/app/forms/custom-sections/adr-permitted-dangerous-goods/adr-permitted-dangerous-goods.component.ts
index 25471d92d..601872013 100644
--- a/src/app/forms/custom-sections/adr-permitted-dangerous-goods/adr-permitted-dangerous-goods.component.ts
+++ b/src/app/forms/custom-sections/adr-permitted-dangerous-goods/adr-permitted-dangerous-goods.component.ts
@@ -31,8 +31,9 @@ export class AdrPermittedDangerousGoodsComponent
 				if (this.adrBodyType?.includes('battery') || this.adrBodyType?.includes('tank')) {
 					let currentValue: string[] = this.control?.value?.value;
 					if (
-						currentValue.includes(ADRDangerousGood.EXPLOSIVES_TYPE_2) ||
-						currentValue.includes(ADRDangerousGood.EXPLOSIVES_TYPE_3)
+						currentValue &&
+						(currentValue.includes(ADRDangerousGood.EXPLOSIVES_TYPE_2) ||
+							currentValue.includes(ADRDangerousGood.EXPLOSIVES_TYPE_3))
 					) {
 						currentValue = currentValue.filter(
 							(value) => value !== ADRDangerousGood.EXPLOSIVES_TYPE_3 && value !== ADRDangerousGood.EXPLOSIVES_TYPE_2