diff --git a/app/Livewire/CustomFieldSetDefaultValuesForModel.php b/app/Livewire/CustomFieldSetDefaultValuesForModel.php
index 0ca733eb24..3421365559 100644
--- a/app/Livewire/CustomFieldSetDefaultValuesForModel.php
+++ b/app/Livewire/CustomFieldSetDefaultValuesForModel.php
@@ -24,7 +24,15 @@ class CustomFieldSetDefaultValuesForModel extends Component
         $this->fieldset_id = $this->model?->fieldset_id;
         $this->add_default_values = ($this->model?->defaultValues->count() > 0);
 
+
         $this->initializeSelectedValuesArray();
+        if (session()->has('errors')) {
+            $errors = session('errors')->keys();
+            $selectedValuesKeys = array_keys($this->selectedValues);
+            if (count(array_intersect($selectedValuesKeys, $errors)) > 0) {
+                $this->add_default_values = true;
+            };
+        }
         $this->populatedSelectedValuesArray();
     }
 
diff --git a/resources/views/livewire/custom-field-set-default-values-for-model.blade.php b/resources/views/livewire/custom-field-set-default-values-for-model.blade.php
index f6351fa010..4ed5a2ec48 100644
--- a/resources/views/livewire/custom-field-set-default-values-for-model.blade.php
+++ b/resources/views/livewire/custom-field-set-default-values-for-model.blade.php
@@ -11,6 +11,7 @@
         <div class="col-md-3">
             @if ($fieldset_id)
                 <label class="form-control">
+
                     {{ Form::checkbox('add_default_values', 1, old('add_default_values', $add_default_values), ['data-livewire-component' => $this->getId(), 'id' => 'add_default_values', 'wire:model.live' => 'add_default_values', 'disabled' => $this->fields->isEmpty()]) }}
                     {{ trans('admin/models/general.add_default_values') }}
                 </label>
@@ -18,8 +19,9 @@
         </div>
     </div>
 
-    @if ($add_default_values || $errors->count() > 0)
-            @if ($this->fields)
+    @if ($add_default_values)
+
+        @if ($this->fields)
 
                 @foreach ($this->fields as $field)
                 @if($errors->has($field->db_column_name()))
diff --git a/resources/views/models/edit.blade.php b/resources/views/models/edit.blade.php
index 5cc1c0c5e3..9c72107ef8 100755
--- a/resources/views/models/edit.blade.php
+++ b/resources/views/models/edit.blade.php
@@ -36,7 +36,7 @@
 
 <!-- Custom Fieldset -->
 <!-- If $item->id is null we are cloning the model and we need the $model_id variable -->
-@livewire('custom-field-set-default-values-for-model', ["model_id" => $item->id ?? $model_id ?? null, "errors" => $errors])
+@livewire('custom-field-set-default-values-for-model', ["model_id" => $item->id ?? $model_id ?? null])
 
 @include ('partials.forms.edit.notes')
 @include ('partials.forms.edit.requestable', ['requestable_text' => trans('admin/models/general.requestable')])