diff --git a/addon/components/meta-fields.hbs b/addon/components/meta-fields.hbs
index dfbfd689..8bc10c26 100644
--- a/addon/components/meta-fields.hbs
+++ b/addon/components/meta-fields.hbs
@@ -5,9 +5,10 @@
         <PowerSelect
           @disabled={{field.readOnly}}
           @options={{field.options}}
-          @selected={{find-by "value" (get @model.meta field.slug) @field.options}}
+          @selected={{find-by "value" (get @model.meta field.slug) field.options}}
           @onChange={{fn this.updateMetaField field @model}}
           @placeholder={{concat (get field.label this.intl.primaryLocale) "..."}}
+          @allowClear={{true}}
           as |option|
         >
           {{get option.label this.intl.primaryLocale}}
diff --git a/addon/components/meta-fields.js b/addon/components/meta-fields.js
index 62e83165..4810c9f2 100644
--- a/addon/components/meta-fields.js
+++ b/addon/components/meta-fields.js
@@ -7,7 +7,7 @@ export default class EditFormComponent extends Component {
 
   @action
   updateMetaField(field, model, optionOrEvent) {
-    const value = optionOrEvent.target?.value ?? optionOrEvent.value;
+    const value = optionOrEvent?.target?.value ?? optionOrEvent?.value;
     model.meta = { ...model.meta, [field.slug]: value };
     model.notifyPropertyChange("meta");
   }