diff --git a/app/Livewire/CustomFieldSetDefaultValuesForModel.php b/app/Livewire/CustomFieldSetDefaultValuesForModel.php
index db9f557c6..23c747c2e 100644
--- a/app/Livewire/CustomFieldSetDefaultValuesForModel.php
+++ b/app/Livewire/CustomFieldSetDefaultValuesForModel.php
@@ -13,7 +13,6 @@ class CustomFieldSetDefaultValuesForModel extends Component
     public $add_default_values;
 
     public $fieldset_id;
-    public $fields;
     public $model_id;
 
     public function mount($model_id = null)
@@ -30,7 +29,7 @@ class CustomFieldSetDefaultValuesForModel extends Component
     }
 
     #[Computed]
-    public function customFields()
+    public function fields()
     {
         return CustomFieldset::find($this->fieldset_id)?->fields;
     }
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 7234e5144..a022caa49 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
@@ -17,9 +17,9 @@
     </div>
 
     @if ($add_default_values ) {{-- 'if the checkbox is enabled *AND* there are more than 0 fields in the fieldsset' --}}
-            @if ($this->customFields)
+            @if ($this->fields)
 
-                @foreach ($this->customFields as $field)
+                @foreach ($this->fields as $field)
                     <div class="form-group">
 
                         <label class="col-md-3 control-label{{ $errors->has($field->name) ? ' has-error' : '' }}">{{ $field->name }}</label>