diff --git a/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-list-container/aggregation-mapping-list/aggregation-mapping-list-item/aggregation-mapping-list-item.component.html b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-list-container/aggregation-mapping-list/aggregation-mapping-list-item/aggregation-mapping-list-item.component.html
index 6b1643e863ce1ef14f5ccb4bc3f5947bb29d157f..9c4788d829ced3e228a1f73861c33dcd63f647df 100644
--- a/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-list-container/aggregation-mapping-list/aggregation-mapping-list-item/aggregation-mapping-list-item.component.html
+++ b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-list-container/aggregation-mapping-list/aggregation-mapping-list-item/aggregation-mapping-list-item.component.html
@@ -4,13 +4,12 @@
       <dt class="sr-only">Name</dt>
       <dd class="font-semibold" data-test-class="list-item-name">{{ aggregationMapping.name }}</dd>
     </div>
-    <!-- Remove null safe check operator after backend provides correct data. -->
     <div class="flex-wrap flex-1">
       <dt class="sr-only">Formengine</dt>
-      <dd data-test-class="list-item-form-engine-name">{{ aggregationMapping.formIdentifier?.formEngineName }}</dd>
+      <dd data-test-class="list-item-form-engine-name">{{ aggregationMapping.formIdentifier.formEngineName }}</dd>
 
       <dt class="sr-only">Form ID</dt>
-      <dd data-test-class="list-item-form-id">{{ aggregationMapping.formIdentifier?.formId }}</dd>
+      <dd data-test-class="list-item-form-id">{{ aggregationMapping.formIdentifier.formId }}</dd>
     </div>
   </dl>
 </ods-list-item>