diff --git a/frontend/app/components/wp-edit/field-types/wp-edit-multi-select-field.module.ts b/frontend/app/components/wp-edit/field-types/wp-edit-multi-select-field.module.ts
index 81eab1119d..c11a1f73ca 100644
--- a/frontend/app/components/wp-edit/field-types/wp-edit-multi-select-field.module.ts
+++ b/frontend/app/components/wp-edit/field-types/wp-edit-multi-select-field.module.ts
@@ -91,21 +91,19 @@ export class MultiSelectEditField extends EditField {
    */
   public buildSelectedOption() {
     const value:HalResource|HalResource[] = this.changeset.value(this.name);
-    const finder = (val:{ href:string|null }) => _.find(this.valueOptions,
-      (valueOption) => valueOption.href === val.href)!;
 
     if (this.isMultiselect) {
       if (!Array.isArray(value)) {
-        return [finder(value)];
+        return [this.findValueOption(value)];
       }
 
-      return value.map(val => finder(val));
+      return value.map(val => this.findValueOption(val));
     }
 
     if (!Array.isArray(value)) {
-      return finder(value);
+      return this.findValueOption(value);
     } else if (value.length > 0) {
-      return finder(value[0]);
+      return this.findValueOption(value[0]);
     }
 
     return this.nullOption;
@@ -148,6 +146,16 @@ export class MultiSelectEditField extends EditField {
     this._selectedOption = this.buildSelectedOption();
   }
 
+  private findValueOption(option?:HalResource):ValueOption {
+    let result;
+
+    if (option) {
+      result = _.find(this.valueOptions, (valueOption) => valueOption.href === option.href)!;
+    }
+    
+    return result || this.nullOption;
+  }
+
   private setValues(availableValues:any[], sortValuesByName:boolean = false) {
     if (sortValuesByName) {
       availableValues.sort(function (a:any, b:any) {