diff --git a/resources/views/dashboard/components/add.blade.php b/resources/views/dashboard/components/add.blade.php
index d482924b..5f6d4a7f 100644
--- a/resources/views/dashboard/components/add.blade.php
+++ b/resources/views/dashboard/components/add.blade.php
@@ -33,17 +33,18 @@
                             <label>{{ trans('forms.components.description') }}</label>
                             <textarea name="component[description]" class="form-control" rows="5"></textarea>
                         </div>
-                        <input type="hidden" name="component[group_id]" value="0">
                         @if($groups->count() > 0)
                         <div class="form-group">
                             <label>{{ trans('forms.components.group') }}</label>
                             <select name="component[group_id]" class="form-control">
-                                <option selected></option>
+                                <option value="0" selected></option>
                                 @foreach($groups as $group)
                                 <option value="{{ $group->id }}">{{ $group->name }}</option>
                                 @endforeach
                             </select>
                         </div>
+                        @else
+                        <input type="hidden" name="component[group_id]" value="0">
                         @endif
                         <hr>
                         <div class="form-group">
diff --git a/resources/views/dashboard/components/edit.blade.php b/resources/views/dashboard/components/edit.blade.php
index 964879a9..1232fea4 100644
--- a/resources/views/dashboard/components/edit.blade.php
+++ b/resources/views/dashboard/components/edit.blade.php
@@ -33,17 +33,18 @@
                             <label>{{ trans('forms.components.description') }}</label>
                             <textarea name="component[description]" class="form-control" rows="5">{{ $component->description }}</textarea>
                         </div>
-                        <input type="hidden" name="component[group_id]" value="0">
                         @if($groups->count() > 0)
                         <div class="form-group">
                             <label>{{ trans('forms.components.group') }}</label>
                             <select name="component[group_id]" class="form-control">
-                                <option {{ $component->group_id === null ? 'selected' : null }}></option>
+                                <option value="0" {{ $component->group_id === null ? 'selected' : null }}></option>
                                 @foreach($groups as $group)
                                 <option value="{{ $group->id }}" {{ $component->group_id === $group->id ? 'selected' : null }}>{{ $group->name }}</option>
                                 @endforeach
                             </select>
                         </div>
+                        @else
+                        <input type="hidden" name="component[group_id]" value="0">
                         @endif
                         <hr>
                         <div class="form-group">