diff --git a/projects/common/unit.ts b/projects/common/unit.ts
index cb88ea58a2b6f2233b9d579e1355f0bb71839a4f..e276082b0af4d535051d97ab0501388a60d6d780 100644
--- a/projects/common/unit.ts
+++ b/projects/common/unit.ts
@@ -94,7 +94,7 @@ export interface TextAreaElement extends InputUIElement, TextUIElement, SurfaceU
 }
 
 export interface CheckboxElement extends InputUIElement, TextUIElement, SurfaceUIElement {
-  value: boolean | undefined;
+  value: boolean;
 }
 
 export interface DropdownElement extends InputUIElement, TextUIElement, SurfaceUIElement {
diff --git a/projects/editor/src/app/UnitFactory.ts b/projects/editor/src/app/UnitFactory.ts
index 777ded6e534de2c1813dfcee8695f11edab4cff8..6bea4118eb1736693ac45a233497af14b97a970b 100644
--- a/projects/editor/src/app/UnitFactory.ts
+++ b/projects/editor/src/app/UnitFactory.ts
@@ -134,7 +134,7 @@ export function createTextareaElement(): TextAreaElement {
 export function createCheckboxElement(): CheckboxElement {
   return <CheckboxElement>{
     ...createUnitUIElement('checkbox'),
-    ...createInputUIElement('Label Checkbox', undefined),
+    ...createInputUIElement('Label Checkbox', false),
     ...createTextUIElement(),
     ...createSurfaceUIElement(),
     backgroundColor: 'transparent'
diff --git a/projects/editor/src/app/components/unit-view/page-view/properties/element-properties.component.ts b/projects/editor/src/app/components/unit-view/page-view/properties/element-properties.component.ts
index e41a40ce176d270248af4e8e06c5034ff5d45fb9..e7e726b1bd86efdb6561ce65cea80dbcfdce909f 100644
--- a/projects/editor/src/app/components/unit-view/page-view/properties/element-properties.component.ts
+++ b/projects/editor/src/app/components/unit-view/page-view/properties/element-properties.component.ts
@@ -45,10 +45,10 @@ import { SelectionService } from '../../../../selection.service';
             </mat-form-field>
             <section *ngIf="combinedProperties.type === 'checkbox'">
               Vorbelegung
-              <mat-button-toggle-group (change)="transformToBoolAndUpdateModel('value', $event.value)">
-                <mat-button-toggle value="true">wahr</mat-button-toggle>
-                <mat-button-toggle value="false">falsch</mat-button-toggle>
-                <mat-button-toggle value="undefined">undefiniert</mat-button-toggle>
+              <mat-button-toggle-group [value]="combinedProperties.value"
+                                       (change)="updateModel('value', $event.value)">
+                <mat-button-toggle [value]="true">wahr</mat-button-toggle>
+                <mat-button-toggle [value]="false">falsch</mat-button-toggle>
               </mat-button-toggle-group>
             </section>
             <mat-form-field *ngIf="combinedProperties.type === 'dropdown' || combinedProperties.type === 'radio'"
@@ -399,24 +399,6 @@ export class ElementPropertiesComponent implements OnInit, OnDestroy {
     this.unitService.alignElements(this.selectionService.getSelectedElements(), direction);
   }
 
-  /* button group always handles values as string and since we also want to handle undefined
-   we need to transform the value before passing it on. */
-  transformToBoolAndUpdateModel(property: string, value: string): void { // TODO weg refactorn
-    switch (value) {
-      case 'true': {
-        this.updateModel(property, true);
-        break;
-      }
-      case 'false': {
-        this.updateModel(property, false);
-        break;
-      }
-      default: {
-        this.updateModel(property, undefined);
-      }
-    }
-  }
-
   deleteElement(): void {
     this.selectionService.selectedPageSection
       .pipe(take(1))