diff --git a/alfa-client/libs/binary-file/src/lib/binary-file-list-container/binary-file-list-container.component.html b/alfa-client/libs/binary-file/src/lib/binary-file-list-container/binary-file-list-container.component.html
index cfa93fbc6b3b9dbd01834a8d31c1bf74f4088299..de2d67af94b520ec15bb8292ef9278cb78d8e395 100644
--- a/alfa-client/libs/binary-file/src/lib/binary-file-list-container/binary-file-list-container.component.html
+++ b/alfa-client/libs/binary-file/src/lib/binary-file-list-container/binary-file-list-container.component.html
@@ -23,9 +23,7 @@
     unter der Lizenz sind dem Lizenztext zu entnehmen.
 
 -->
-<ods-attachment-wrapper>
-  <alfa-binary-file-list
-    [binaryFileListStateResource]="binaryFileListStateResource$ | async"
-    [listOrientation]="listOrientation"
-  ></alfa-binary-file-list>
-</ods-attachment-wrapper>
+<alfa-binary-file-list
+  [binaryFileListStateResource]="binaryFileListStateResource$ | async"
+  [listOrientation]="listOrientation"
+></alfa-binary-file-list>
diff --git a/alfa-client/libs/binary-file/src/lib/binary-file-list-container/binary-file-list-container.component.spec.ts b/alfa-client/libs/binary-file/src/lib/binary-file-list-container/binary-file-list-container.component.spec.ts
index e9473e9ee486bc437328ee6fe85227d12c6293e5..6cca0983e8268484b83772fa1f78dafda782e70e 100644
--- a/alfa-client/libs/binary-file/src/lib/binary-file-list-container/binary-file-list-container.component.spec.ts
+++ b/alfa-client/libs/binary-file/src/lib/binary-file-list-container/binary-file-list-container.component.spec.ts
@@ -34,27 +34,19 @@ import { of } from 'rxjs';
 import { BinaryFileListContainerComponent } from './binary-file-list-container.component';
 import { BinaryFileListComponent } from './binary-file-list/binary-file-list.component';
 
-import { AttachmentWrapperComponent } from '@ods/system';
-
 describe('BinaryFileListContainerComponent', () => {
   let component: BinaryFileListContainerComponent;
   let fixture: ComponentFixture<BinaryFileListContainerComponent>;
 
   const binaryFileService: Mock<BinaryFileService> = mock(BinaryFileService);
 
-  const binaryFileStateResource: StateResource<BinaryFileResource> = createStateResource(
-    createBinaryFileResource(),
-  );
+  const binaryFileStateResource: StateResource<BinaryFileResource> = createStateResource(createBinaryFileResource());
   const resource: Resource = createDummyResource();
   const linkRel: LinkRelationName = DummyLinkRel.DUMMY;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [
-        BinaryFileListContainerComponent,
-        MockComponent(BinaryFileListComponent),
-        MockComponent(AttachmentWrapperComponent),
-      ],
+      declarations: [BinaryFileListContainerComponent, MockComponent(BinaryFileListComponent)],
       providers: [
         {
           provide: BinaryFileService,
@@ -85,8 +77,10 @@ describe('BinaryFileListContainerComponent', () => {
 
   describe('binary file list', () => {
     it('should be called with binary file state resource', () => {
-      const binaryFileListComponent: BinaryFileListComponent =
-        getMockComponent<BinaryFileListComponent>(fixture, BinaryFileListComponent);
+      const binaryFileListComponent: BinaryFileListComponent = getMockComponent<BinaryFileListComponent>(
+        fixture,
+        BinaryFileListComponent,
+      );
 
       expect(binaryFileListComponent.binaryFileListStateResource).toBe(binaryFileStateResource);
     });
diff --git a/alfa-client/libs/binary-file/src/lib/binary-file-list-container/binary-file-list/binary-file-list.component.html b/alfa-client/libs/binary-file/src/lib/binary-file-list-container/binary-file-list/binary-file-list.component.html
index 70054de869940144f9b0e1d3fa0eb7c23ea72a33..a4ee6adc69c75525b8a32dd2e0ad5a9352701c2d 100644
--- a/alfa-client/libs/binary-file/src/lib/binary-file-list-container/binary-file-list/binary-file-list.component.html
+++ b/alfa-client/libs/binary-file/src/lib/binary-file-list-container/binary-file-list/binary-file-list.component.html
@@ -23,11 +23,13 @@
     unter der Lizenz sind dem Lizenztext zu entnehmen.
 
 -->
-<div [binaryFileListOrientation]="listOrientation">
-  <alfa-binary-file2-container
-    *ngFor="let binaryFile of binaryFileListStateResource.resource | toEmbeddedResources: binaryFileListLinkRel.FILE_LIST"
-    [file]="binaryFile"
-    [deletable]="false"
-  >
-  </alfa-binary-file2-container>
-</div>
+@if (binaryFileListStateResource.resource | toEmbeddedResources: binaryFileListLinkRel.FILE_LIST; as binaryFileList) {
+  @if (binaryFileList.length) {
+    <ods-attachment-wrapper data-test-id="binary-file-list-wrapper">
+      <div [binaryFileListOrientation]="listOrientation">
+        <alfa-binary-file2-container *ngFor="let binaryFile of binaryFileList" [file]="binaryFile" [deletable]="false">
+        </alfa-binary-file2-container>
+      </div>
+    </ods-attachment-wrapper>
+  }
+}
diff --git a/alfa-client/libs/binary-file/src/lib/binary-file-list-container/binary-file-list/binary-file-list.component.spec.ts b/alfa-client/libs/binary-file/src/lib/binary-file-list-container/binary-file-list/binary-file-list.component.spec.ts
index fbbc820600ee4d1b3a9235dafd3515f9c1f16404..354a9d2be51cb3f1bd9bdb20d1525ed75b653904 100644
--- a/alfa-client/libs/binary-file/src/lib/binary-file-list-container/binary-file-list/binary-file-list.component.spec.ts
+++ b/alfa-client/libs/binary-file/src/lib/binary-file-list-container/binary-file-list/binary-file-list.component.spec.ts
@@ -23,9 +23,11 @@
  */
 import { BinaryFileListResource, BinaryFileResource } from '@alfa-client/binary-file-shared';
 import { createStateResource, StateResource, ToEmbeddedResourcesPipe } from '@alfa-client/tech-shared';
-import { getMockComponent } from '@alfa-client/test-utils';
+import { existsAsHtmlElement, getMockComponent, notExistsAsHtmlElement } from '@alfa-client/test-utils';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { AttachmentWrapperComponent } from '@ods/system';
 import { createBinaryFileListResource, createBinaryFileResource } from 'libs/binary-file-shared/test/binary-file';
+import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
 import { MockComponent, MockDirective } from 'ng-mocks';
 import { BinaryFile2ContainerComponent } from '../../binary-file2-container/binary-file2-container.component';
 import { BinaryFileListOrientationDirective } from '../../directive/binary-file-list-orientation/binary-file-list-orientation.directive';
@@ -36,9 +38,11 @@ describe('BinaryFileListComponent', () => {
   let fixture: ComponentFixture<BinaryFileListComponent>;
 
   const binaryFile: BinaryFileResource = createBinaryFileResource();
-  const binaryFileListStateResource: StateResource<BinaryFileListResource> = createStateResource(
-    createBinaryFileListResource([binaryFile]),
-  );
+  function getBinaryFileListStateResource(binaryFiles: BinaryFileResource[]): StateResource<BinaryFileListResource> {
+    return createStateResource(createBinaryFileListResource(binaryFiles));
+  }
+
+  const wrapperSelector: string = getDataTestIdOf('binary-file-list-wrapper');
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
@@ -46,13 +50,14 @@ describe('BinaryFileListComponent', () => {
         BinaryFileListComponent,
         ToEmbeddedResourcesPipe,
         MockComponent(BinaryFile2ContainerComponent),
+        MockComponent(AttachmentWrapperComponent),
         MockDirective(BinaryFileListOrientationDirective),
       ],
     }).compileComponents();
 
     fixture = TestBed.createComponent(BinaryFileListComponent);
     component = fixture.componentInstance;
-    component.binaryFileListStateResource = binaryFileListStateResource;
+    component.binaryFileListStateResource = getBinaryFileListStateResource([binaryFile]);
     fixture.detectChanges();
   });
 
@@ -60,6 +65,22 @@ describe('BinaryFileListComponent', () => {
     expect(component).toBeTruthy();
   });
 
+  describe('template', () => {
+    describe('attachment wrapper', () => {
+      it('should show', () => {
+        existsAsHtmlElement(fixture, wrapperSelector);
+      });
+
+      it('should hide', () => {
+        component.binaryFileListStateResource = getBinaryFileListStateResource([]);
+
+        fixture.detectChanges();
+
+        notExistsAsHtmlElement(fixture, wrapperSelector);
+      });
+    });
+  });
+
   describe('binary file container', () => {
     it('should be called with file', () => {
       const binaryFileContainerComponent: BinaryFile2ContainerComponent = getMockComponent<BinaryFile2ContainerComponent>(