diff --git a/apps/mina-sidor-fa/src/app/pages/avrop/avrop.component.html b/apps/mina-sidor-fa/src/app/pages/avrop/avrop.component.html
index 33dacab..ed58f5c 100644
--- a/apps/mina-sidor-fa/src/app/pages/avrop/avrop.component.html
+++ b/apps/mina-sidor-fa/src/app/pages/avrop/avrop.component.html
@@ -50,6 +50,7 @@
                   af-label="Välj handledare att tilldela"
                   af-placeholder="Välj handledare"
                   [afRequired]="true"
+                  af-validation="error"
                   (afOnChange)="changeHandledare($event.detail)"
                 >
                   <option
@@ -76,7 +77,7 @@
               [handledare]="selectedHandledare$ | async"
               [handledareConfirmed]="handledareConfirmed$ | async"
               [avropLoading]="avropLoading$ | async"
-              (selectionChanged)="updateSelectedAvrop($event)"
+              (selectionChanged)="updateSelectedAvrop($event, currentStep)"
               (paginated)="setNewPage($event)"
             ></msfa-avrop-list>
           </div>
diff --git a/apps/mina-sidor-fa/src/app/pages/avrop/avrop.component.ts b/apps/mina-sidor-fa/src/app/pages/avrop/avrop.component.ts
index 4c93bd8..22345a4 100644
--- a/apps/mina-sidor-fa/src/app/pages/avrop/avrop.component.ts
+++ b/apps/mina-sidor-fa/src/app/pages/avrop/avrop.component.ts
@@ -29,8 +29,12 @@ export class AvropComponent {
 
   constructor(private avropService: AvropService) {}
 
-  updateSelectedAvrop(deltagareList: Avrop[]): void {
-    this.avropService.setSelectedAvrop(deltagareList);
+  updateSelectedAvrop(deltagareList: Avrop[], currentStep: number): void {
+    if (currentStep !== 1 && !deltagareList.length) {
+      this.avropService.goToStep1();
+    } else {
+      this.avropService.setSelectedAvrop(deltagareList);
+    }
   }
 
   lockSelectedAvrop(): void {
diff --git a/apps/mina-sidor-fa/src/app/shared/services/avrop.service.ts b/apps/mina-sidor-fa/src/app/shared/services/avrop.service.ts
index 343a914..cb4cd20 100644
--- a/apps/mina-sidor-fa/src/app/shared/services/avrop.service.ts
+++ b/apps/mina-sidor-fa/src/app/shared/services/avrop.service.ts
@@ -85,7 +85,7 @@ export class AvropService {
   );
 
   public availableHandledare$: Observable<Handledare[]> = this._lockedAvrop$.pipe(
-    filter(lockedAvrop => !!lockedAvrop),
+    filter(lockedAvrop => !!lockedAvrop?.length),
     switchMap(lockedAvrop => this.avropApiService.fetchAvailableHandledare$(lockedAvrop))
   );