diff --git a/web/src/app/administration/components/workbasket-access-items/workbasket-access-items.component.html b/web/src/app/administration/components/workbasket-access-items/workbasket-access-items.component.html
index b51bfa800..93c9782ce 100644
--- a/web/src/app/administration/components/workbasket-access-items/workbasket-access-items.component.html
+++ b/web/src/app/administration/components/workbasket-access-items/workbasket-access-items.component.html
@@ -51,7 +51,7 @@
                 							'has-error': !accessItem.value.accessId }">
 
 							<taskana-shared-type-ahead formControlName="accessId"
-								placeHolderMessage="* Access id is required"
+								placeHolderMessage="Access id *"
 								[validationValue]="toggleValidationAccessIdMap.get(index)"
 								[displayError]="!isFieldValid('accessItem.value.accessId', index)"
 								(selectedItem)="accessItemSelected($event, index)">
@@ -130,4 +130,4 @@
 			</table>
 		</form>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/web/src/app/administration/components/workbasket-access-items/workbasket-access-items.component.ts b/web/src/app/administration/components/workbasket-access-items/workbasket-access-items.component.ts
index 9818f9648..24b1b985b 100644
--- a/web/src/app/administration/components/workbasket-access-items/workbasket-access-items.component.ts
+++ b/web/src/app/administration/components/workbasket-access-items/workbasket-access-items.component.ts
@@ -7,8 +7,7 @@ import {
   OnInit,
   QueryList,
   SimpleChanges,
-  ViewChildren,
-  HostListener
+  ViewChildren
 } from '@angular/core';
 import { Observable, Subject } from 'rxjs';
 import { Actions, ofActionCompleted, Select, Store } from '@ngxs/store';
@@ -182,7 +181,7 @@ export class WorkbasketAccessItemsComponent implements OnInit, OnChanges, OnDest
   }
 
   init() {
-    if (!this.workbasket._links.accessItems) {
+    if (!this.workbasket._links?.accessItems) {
       return;
     }
     this.requestInProgressService.setRequestInProgress(true);
diff --git a/web/src/app/administration/components/workbasket-information/workbasket-information.component.ts b/web/src/app/administration/components/workbasket-information/workbasket-information.component.ts
index 9fee41451..e3ef90759 100644
--- a/web/src/app/administration/components/workbasket-information/workbasket-information.component.ts
+++ b/web/src/app/administration/components/workbasket-information/workbasket-information.component.ts
@@ -217,7 +217,9 @@ export class WorkbasketInformationComponent implements OnInit, OnChanges, OnDest
   }
 
   onSelectedOwner(owner: AccessIdDefinition) {
-    this.workbasket.owner = owner.accessId;
+    if (owner?.accessId) {
+      this.workbasket.owner = owner.accessId;
+    }
   }
 
   getWorkbasketCustomProperty(custom: number) {