diff --git a/src/app/components/generic-select/generic-select.component.ts b/src/app/components/generic-select/generic-select.component.ts
index 7dd5f113a48068b58506e731d1eb3308120994ea..c440f34221c9743d78e35035de0199d006cd4583 100644
--- a/src/app/components/generic-select/generic-select.component.ts
+++ b/src/app/components/generic-select/generic-select.component.ts
@@ -41,8 +41,11 @@ export abstract class GenericSelectComponent {
     }
 
     private onSelect(event: any) {
-        this._selectedValue = event.target.value;
-        this.selectChange.emit(this._selectedValue);
+        const val = event.target.value;
+        if (val != undefined) {
+            this._selectedValue = val;
+            this.selectChange.emit(this._selectedValue);
+        }
     }
 
     /**