diff --git a/docs/release-notes-player.txt b/docs/release-notes-player.txt
index f16ac26e13f6a5a308e3cd1aa92d35939484ff67..67577d55da5e8eab04c2ca607f484a7609c39c88 100644
--- a/docs/release-notes-player.txt
+++ b/docs/release-notes-player.txt
@@ -6,6 +6,7 @@ Player
 - Fix the response status when re-entering the unit
 - Fix position of virtual keyboard for text areas
 - Rename marking tag of text to 'aspect-marked'
+- Restore the state of likert elements when re-entering a unit
 
 1.11.0
 - For spelling element use the same font properties for input field and button
diff --git a/projects/player/src/app/components/element-container/element-container.component.ts b/projects/player/src/app/components/element-container/element-container.component.ts
index 4e0c58781dfea9ba2a4d7ed3f95ce77203d12813..0390ad81f52e296b0915e4b83f0b4d5783a0f715 100644
--- a/projects/player/src/app/components/element-container/element-container.component.ts
+++ b/projects/player/src/app/components/element-container/element-container.component.ts
@@ -106,16 +106,16 @@ export class ElementContainerComponent implements OnInit {
   private initCompoundElement(elementComponent: any): void {
     const elementForm = this.formBuilder.group({});
     elementComponent.parentForm = elementForm;
-    this.subscribeCompoundChildren(elementComponent);
-    elementComponent.getFormElementModelChildren()
-      .forEach((element: InputElement) => {
-        this.registerFormGroup(elementForm);
-        this.formService.registerFormControl({
-          id: element.id,
-          formControl: new FormControl(element.value),
-          formGroup: elementForm
-        });
+    const compoundChildren = elementComponent.getFormElementModelChildren();
+    this.subscribeCompoundChildren(elementComponent, compoundChildren);
+    compoundChildren.forEach((element: InputElement) => {
+      this.registerFormGroup(elementForm);
+      this.formService.registerFormControl({
+        id: element.id,
+        formControl: new FormControl(element.value),
+        formGroup: elementForm
       });
+    });
   }
 
   private registerAtUnitStateService(elementComponent: any): void {
@@ -128,12 +128,14 @@ export class ElementContainerComponent implements OnInit {
     }
   }
 
-  private subscribeCompoundChildren(elementComponent: any): void {
+  private subscribeCompoundChildren(elementComponent: any, compoundChildren: InputElement[]): void {
     if (elementComponent.childrenAdded) {
       elementComponent.childrenAdded
         .pipe(takeUntil(this.ngUnsubscribe))
         .subscribe((children: QueryList<ElementComponent>) => {
-          children.forEach(child => {
+          children.forEach((child, index) => {
+            const childModel = compoundChildren[index];
+            child.elementModel = this.restoreUnitStateValue(childModel);
             this.unitStateService.registerElement(
               this.initUnitStateValue(child.elementModel),
               child.domElement,