diff --git a/lib/NGCP/Panel/Utils/Preferences.pm b/lib/NGCP/Panel/Utils/Preferences.pm
index 3865ca9240..dc6fea6416 100644
--- a/lib/NGCP/Panel/Utils/Preferences.pm
+++ b/lib/NGCP/Panel/Utils/Preferences.pm
@@ -319,9 +319,7 @@ sub create_preference_form {
             if( ($c->stash->{preference_meta}->data_type ne 'enum' &&
                 $form->field($attribute)->value eq '') ||
                 ($c->stash->{preference_meta}->data_type eq 'enum' &&
-                $c->stash->{preference_meta}->voip_preferences_enums->find({
-                    value => $form->field($attribute)->value
-                })->default_val == 1)
+                ! defined $form->field($attribute)->value)
                 ) {
                 my $preference = $pref_rs->find($preference_id);
                 $preference->delete if $preference;
diff --git a/share/templates/helpers/pref_table.tt b/share/templates/helpers/pref_table.tt
index 41da94e77f..13053f6c88 100644
--- a/share/templates/helpers/pref_table.tt
+++ b/share/templates/helpers/pref_table.tt
@@ -126,7 +126,7 @@
                     [% ELSIF r.data_type == "enum" %]
                         <select disabled="disabled">
                         [% FOREACH e IN r.enums %]
-                            <option [% IF r.value == e.value || (!r.value.defined && e.default_val == 1) %]selected="selected"[% END %]>[% e.label %]</option>
+                            <option [% IF r.value == e.value || (!r.value.defined && ! e.value.defined) %]selected="selected"[% END %]>[% e.label %]</option>
                         [% END %]
                         </select>
                     [% END %]