diff --git a/alfa-client/libs/admin/statistik/src/lib/statistik-container/statistik-container.component.html b/alfa-client/libs/admin/statistik/src/lib/statistik-container/statistik-container.component.html
index 09cc3244d77a378a2e91d0acaa2d1551fd1628a0..8ee2413999f33a618d0ac6032951ae56f9589939 100644
--- a/alfa-client/libs/admin/statistik/src/lib/statistik-container/statistik-container.component.html
+++ b/alfa-client/libs/admin/statistik/src/lib/statistik-container/statistik-container.component.html
@@ -24,7 +24,9 @@
 
 -->
 <h1 class="heading-1" data-test-id="statistik-header-text">Statistik</h1>
-@if (!evaluateAdditionalFields) {
+@if (evaluateAdditionalFields) {
+  <admin-statistik-fields-form data-test-id="statistik-fields-form"></admin-statistik-fields-form>
+} @else {
   <ods-button
     text="Weitere Felder auswerten"
     (clickEmitter)="onEvaluateAdditionalFields()"
diff --git a/alfa-client/libs/admin/statistik/src/lib/statistik-container/statistik-container.component.spec.ts b/alfa-client/libs/admin/statistik/src/lib/statistik-container/statistik-container.component.spec.ts
index beb4e71bca59c1b28715694884c5f32917d31f3f..8c02510de78974e809e86d6db354a09cd52b4879 100644
--- a/alfa-client/libs/admin/statistik/src/lib/statistik-container/statistik-container.component.spec.ts
+++ b/alfa-client/libs/admin/statistik/src/lib/statistik-container/statistik-container.component.spec.ts
@@ -31,6 +31,7 @@ describe('StatistikContainerComponent', () => {
   let fixture: ComponentFixture<StatistikContainerComponent>;
 
   const evaluateAdditionalFieldsTestId: string = getDataTestIdOf('weitere-felder-auswerten-button');
+  const statistikFieldsFormTestId: string = getDataTestIdOf('statistik-fields-form');
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
@@ -100,5 +101,23 @@ describe('StatistikContainerComponent', () => {
         });
       });
     });
+
+    describe('stastik fields form', () => {
+      it('should exists', () => {
+        component.evaluateAdditionalFields = true;
+
+        fixture.detectChanges();
+
+        existsAsHtmlElement(fixture, statistikFieldsFormTestId);
+      });
+
+      it('should NOT exists', () => {
+        component.evaluateAdditionalFields = false;
+
+        fixture.detectChanges();
+
+        notExistsAsHtmlElement(fixture, statistikFieldsFormTestId);
+      });
+    });
   });
 });
diff --git a/alfa-client/libs/admin/statistik/src/lib/statistik-container/statistik-container.component.ts b/alfa-client/libs/admin/statistik/src/lib/statistik-container/statistik-container.component.ts
index bf802db58ef659c43e9e8a8c4881c293f83917af..e6442a1ebc348518ff9e9e1e2e6076b12e00b450 100644
--- a/alfa-client/libs/admin/statistik/src/lib/statistik-container/statistik-container.component.ts
+++ b/alfa-client/libs/admin/statistik/src/lib/statistik-container/statistik-container.component.ts
@@ -24,12 +24,13 @@
 import { CommonModule } from '@angular/common';
 import { Component } from '@angular/core';
 import { ButtonComponent } from '@ods/system';
+import { AdminStatistikFieldsFormComponent } from './statistik-fields-form/admin-statistik-fields-form.component';
 
 @Component({
   selector: 'admin-statistik-container',
   templateUrl: './statistik-container.component.html',
   standalone: true,
-  imports: [CommonModule, ButtonComponent],
+  imports: [CommonModule, ButtonComponent, AdminStatistikFieldsFormComponent],
 })
 export class StatistikContainerComponent {
   public evaluateAdditionalFields: boolean = false;
diff --git a/alfa-client/libs/admin/statistik/src/lib/statistik-container/statistik-fields-form/admin-statistik-fields-form.component.html b/alfa-client/libs/admin/statistik/src/lib/statistik-container/statistik-fields-form/admin-statistik-fields-form.component.html
new file mode 100644
index 0000000000000000000000000000000000000000..ea4459162197ac7a91ea02431a23203ec3dccd51
--- /dev/null
+++ b/alfa-client/libs/admin/statistik/src/lib/statistik-container/statistik-fields-form/admin-statistik-fields-form.component.html
@@ -0,0 +1 @@
+<p>admin-statistik-fields-form works!</p>
diff --git a/alfa-client/libs/admin/statistik/src/lib/statistik-container/statistik-fields-form/admin-statistik-fields-form.component.spec.ts b/alfa-client/libs/admin/statistik/src/lib/statistik-container/statistik-fields-form/admin-statistik-fields-form.component.spec.ts
new file mode 100644
index 0000000000000000000000000000000000000000..d53fa335ea3020ec2291ef32075256182a99f2af
--- /dev/null
+++ b/alfa-client/libs/admin/statistik/src/lib/statistik-container/statistik-fields-form/admin-statistik-fields-form.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { AdminStatistikFieldsFormComponent } from './admin-statistik-fields-form.component';
+
+describe('AdminStatistikFieldsFormComponent', () => {
+  let component: AdminStatistikFieldsFormComponent;
+  let fixture: ComponentFixture<AdminStatistikFieldsFormComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [AdminStatistikFieldsFormComponent],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(AdminStatistikFieldsFormComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/alfa-client/libs/admin/statistik/src/lib/statistik-container/statistik-fields-form/admin-statistik-fields-form.component.ts b/alfa-client/libs/admin/statistik/src/lib/statistik-container/statistik-fields-form/admin-statistik-fields-form.component.ts
new file mode 100644
index 0000000000000000000000000000000000000000..2d5bbced355118f41d22250129b74a0bc8ea8c1a
--- /dev/null
+++ b/alfa-client/libs/admin/statistik/src/lib/statistik-container/statistik-fields-form/admin-statistik-fields-form.component.ts
@@ -0,0 +1,10 @@
+import { CommonModule } from '@angular/common';
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'admin-statistik-fields-form',
+  standalone: true,
+  imports: [CommonModule],
+  templateUrl: './admin-statistik-fields-form.component.html',
+})
+export class AdminStatistikFieldsFormComponent {}