diff --git a/resources/views/jenis_jaminan/create.blade.php b/resources/views/jenis_jaminan/create.blade.php
index 9c8f44a..bf39e4b 100644
--- a/resources/views/jenis_jaminan/create.blade.php
+++ b/resources/views/jenis_jaminan/create.blade.php
@@ -75,9 +75,14 @@
                             name="form_kategori[]" multiple="multiple">
 
                             <option value="">Pilih Form</option>
-                            @foreach (['tanah', 'bangunan', 'kapal', 'kendaraan', 'mesin', 'pesawat', 'alat-berat', 'apartemen-kantor','lingkungan', 'fakta','informasi'] as $item)
-                                <option value="{{ $item }}"
-                                    @if (isset($jenisJaminan->form_kategori) && in_array($item, json_decode($jenisJaminan->form_kategori, true))) {{ 'selected' }} @endif>
+                            @php
+                                $formKategoriOptions = ['tanah', 'bangunan', 'kapal', 'kendaraan', 'mesin', 'pesawat', 'alat-berat', 'apartemen-kantor', 'lingkungan', 'fakta', 'informasi'];
+                                $selectedOptions = isset($jenisJaminan->form_kategori) ? json_decode($jenisJaminan->form_kategori, true) : [];
+                                $selectedOptions = is_array($selectedOptions) ? $selectedOptions : [];
+                            @endphp
+
+                            @foreach ($formKategoriOptions as $item)
+                                <option value="{{ $item }}" {{ in_array($item, $selectedOptions) ? 'selected' : '' }}>
                                     {{ $item }}
                                 </option>
                             @endforeach
@@ -95,7 +100,7 @@
                     <div class="grid grid-cols-3 lg:grid-cols-4 w-full gap-2.5">
                         @foreach ($jenisLegalitasJaminan as $row)
                             <label class="switch">
-                                @if (isset($jenisJaminan->jenis_legalitas_jaminan_id))
+                                @if (!empty(json_decode($jenisJaminan->jenis_legalitas_jaminan_id, true)))
                                     <input type="checkbox" @if (in_array($row->code, json_decode($jenisJaminan->jenis_legalitas_jaminan_id, true))) {{ 'checked' }} @endif
                                         value="{{ $row->code }}" name="jenis_legalitas_jaminan_id[]" />
                                 @else