diff --git a/app/Providers/Form.php b/app/Providers/Form.php
index df530311c..69395ae74 100644
--- a/app/Providers/Form.php
+++ b/app/Providers/Form.php
@@ -92,7 +92,7 @@ class Form extends Provider
         ]);
 
         Facade::component('checkboxGroup', 'partials.form.checkbox_group', [
-            'name', 'text', 'items' => [], 'value' => 'name', 'id' => 'id', 'attributes' => ['required' => 'required'], 'col' => 'col-md-12',
+            'name', 'text', 'items' => [], 'value' => 'name', 'id' => 'id', 'selected'=>[], 'attributes' => ['required' => 'required'], 'col' => 'col-md-12',
         ]);
 
         Facade::component('fileGroup', 'partials.form.file_group', [
diff --git a/resources/views/partials/form/checkbox_group.blade.php b/resources/views/partials/form/checkbox_group.blade.php
index 028ee1e39..fed6c679e 100644
--- a/resources/views/partials/form/checkbox_group.blade.php
+++ b/resources/views/partials/form/checkbox_group.blade.php
@@ -11,7 +11,7 @@
             @foreach($items as $item)
                 <div class="col-md-3">
                     <div class="custom-control custom-checkbox">
-                        {{ Form::checkbox($name, $item->$id, null, [
+                        {{ Form::checkbox($name, $item->$id, (is_array($selected) && count($selected) ? (in_array($item->$id, $selected) ? true : false) : null), [
                             'id' => 'checkbox-' . $name . '-' . $item->$id,
                             'class' => 'custom-control-input',
                             'v-model' => !empty($attributes['v-model']) ? $attributes['v-model'] : (!empty($attributes['data-field']) ? 'form.' . $attributes['data-field'] . '.'. $name : 'form.' . $name),