diff --git a/app/Http/Controllers/Web/Produktivitas/PetaniLahanController.php b/app/Http/Controllers/Web/Produktivitas/PetaniLahanController.php
index 248413b..c4febdb 100644
--- a/app/Http/Controllers/Web/Produktivitas/PetaniLahanController.php
+++ b/app/Http/Controllers/Web/Produktivitas/PetaniLahanController.php
@@ -81,8 +81,8 @@ class PetaniLahanController extends Controller
             'komoditas_id'          => ['required', 'exists:master_komoditas,id'],
             'jenis_komoditas_id'    => ['required', 'exists:jenis_komoditas,id'],
             'varietas_id'           => ['nullable', 'exists:master_varietas,id'],
-            'jumlah_tanaman'        => ['required', 'numeric', 'min:1'],
-            'umur_lahan'            => ['required', 'numeric', 'min:1'],
+            'jumlah_tanaman'        => ['required', 'numeric', 'min:0'],
+            'umur_lahan'            => ['nullable', 'numeric', 'min:1'],
             'umur_tanaman'          => ['required', 'numeric', 'min:1'],
             'kondisi_tanaman'       => ['required', 'string', new Enum(KondisiTanaman::class)],
             'serangan_hama'         => ['nullable', 'string', new Enum(SeranganHama::class)],
@@ -104,8 +104,8 @@ class PetaniLahanController extends Controller
             'luas_lahan.min'              => 'Luas lahan minimal 0.01.',
             'jumlah_tanaman.required'     => 'Jumlah tanaman wajib diisi.',
             'jumlah_tanaman.numeric'      => 'Jumlah tanaman diisi dengan angka.',
-            'jumlah_tanaman.min'          => 'Jumlah tanaman minimal 1.',
-            'umur_lahan.required'         => 'Umur lahan wajib diisi.',
+            'jumlah_tanaman.min'          => 'Jumlah tanaman minimal 0.',
+            //'umur_lahan.required'         => 'Umur lahan wajib diisi.',
             'umur_lahan.numeric'          => 'Umur lahan diisi dengan angka.',
             'umur_lahan.min'              => 'Umur lahan minimal 1.',
             'umur_tanaman.required'       => 'Umur tanaman wajib diisi.',
@@ -163,7 +163,7 @@ class PetaniLahanController extends Controller
             'updated_by' => auth()->id()]
         );
 
-        if ($lahan) {
+        if ($lahan && $lahan->jumlah_tanaman > 0) {
             $data = collect(range(1, $lahan->jumlah_tanaman))->map(function ($i) use ($lahan, $komoditas, $lahanUid) {
                 return [
                     'lahan_id' => $lahan->id,
@@ -199,6 +199,8 @@ class PetaniLahanController extends Controller
 
             return redirect()->route('petani.lahan-tanaman.index', $petaniId)->with('success', 'Lahan berhasil ditambahkan.');
         }
+
+        return redirect()->route('petani.lahan-tanaman.index', $petaniId)->with('success', 'Lahan berhasil ditambahkan.');
     }
 
     public function show(string $petaniId, string $id)
diff --git a/resources/views/produktivitas/petani/lahan/add.blade.php b/resources/views/produktivitas/petani/lahan/add.blade.php
index 25a1cb2..ea3daf3 100644
--- a/resources/views/produktivitas/petani/lahan/add.blade.php
+++ b/resources/views/produktivitas/petani/lahan/add.blade.php
@@ -201,13 +201,13 @@
                                             @error('luas_lahan')<div class="error invalid-feedback">{{ $message }}</div>@enderror
                                         </div>
                                         <div class="col-md-3 mb-3 form-control-validation">
-                                            <label class="form-label">Umur Lahan (tahun) <span class="text-danger">*</span></label>
+                                            <label class="form-label">Umur Lahan (tahun)</label>
                                             <input type="number" name="umur_lahan" class="form-control @error('umur_lahan') is-invalid @enderror" placeholder="Contoh: 1" />
                                             @error('umur_lahan')<div class="error invalid-feedback">{{ $message }}</div>@enderror
                                         </div>
                                         <div class="col-md-3 mb-3 form-control-validation">
                                             <label class="form-label">Jumlah Tanaman <span class="text-danger">*</span></label>
-                                            <input type="number" name="jumlah_tanaman" class="form-control @error('jumlah_tanaman') is-invalid @enderror" placeholder="Contoh: 1" required />
+                                            <input type="number" name="jumlah_tanaman" class="form-control @error('jumlah_tanaman') is-invalid @enderror" placeholder="Contoh: 1 (min 0)" required />
                                             @error('jumlah_tanaman')<div class="error invalid-feedback">{{ $message }}</div>@enderror
                                         </div>
                                         <div class="col-md-3 mb-3 form-control-validation">
@@ -707,8 +707,8 @@
                 kabupatenkota_id: { required: true },
                 kecamatan_id: { required: true },
                 desa_kelurahan_id: { required: true },
-                jumlah_tanaman: { required: true },
-                umur_lahan: { required: true, number: true, min: 1 },
+                jumlah_tanaman: { required: true, number: true, min: 0 },
+                umur_lahan: { number: true, min: 1 },
                 umur_tanaman: { required: true, number: true, min: 1 },
                 kondisi_tanaman: { required: true },
             },
@@ -721,8 +721,8 @@
                 kabupatenkota_id: { required: "Kabupaten/Kota wajib diisi" },
                 kecamatan_id: { required: "Kecamatan wajib diisi" },
                 desa_kelurahan_id: { required: "Desa/Kelurahan wajib diisi" },
-                jumlah_tanaman: { required: "Jumlah tanaman wajib diisi" },
-                umur_lahan: { required: "Umur lahan wajib diisi", number: "Umur lahan harus berupa angka",  min: "Umur lahan minimal 1 tahun" },
+                jumlah_tanaman: { required: "Jumlah tanaman wajib diisi", number: "Jumlah tanaman harus berupa angka", min: "Jumlah tanaman minimal 0" },
+                umur_lahan: { number: "Umur lahan harus berupa angka",  min: "Umur lahan minimal 1 tahun" },
                 umur_tanaman: { required: "Umur tanaman wajib diisi", number: "Umur tanaman harus berupa angka", min: "Umur tanaman minimal 1 tahun" },
                 kondisi_tanaman: { required: "Kondisi tanaman wajib diisi" },
             },
diff --git a/resources/views/produktivitas/petani/lahan/edit.blade.php b/resources/views/produktivitas/petani/lahan/edit.blade.php
index e996305..2d4a280 100644
--- a/resources/views/produktivitas/petani/lahan/edit.blade.php
+++ b/resources/views/produktivitas/petani/lahan/edit.blade.php
@@ -63,7 +63,7 @@
                                         </div>
                                         <div class="col-md-3 mb-3 form-control-validation">
                                             <label class="form-label">Jumlah Tanaman <span class="text-danger">*</span></label>
-                                            <input type="number" name="jumlah_tanaman" class="form-control @error('jumlah_tanaman') is-invalid @enderror" placeholder="Contoh: 1" required 
+                                            <input type="number" name="jumlah_tanaman" class="form-control @error('jumlah_tanaman') is-invalid @enderror" placeholder="Contoh: 1 (min 0)" required 
                                                 value="{{ old('jumlah_tanaman', $lahanSelected->jumlah_tanaman) }}" />
                                             @error('jumlah_tanaman')<div class="error invalid-feedback">{{ $message }}</div>@enderror
                                         </div>
@@ -276,7 +276,7 @@
                                         </tr>
                                     </thead>
                                     <tbody>
-                                        @forelse($lahanSelected->tanaman as $index => $item)
+                                        @foreach($lahanSelected->tanaman as $item)
                                             <tr>
                                                 <td>{{ $loop->iteration }}</td> 
                                                 <td>
@@ -339,9 +339,7 @@
                                                     </div>
                                                 </td>
                                             </tr>
-                                        @empty
-                                            <tr><td colspan="6" class="text-center py-4">Tidak ada data ditemukan.</td></tr>
-                                        @endforelse
+                                        @endforeach
                                     </tbody>
                                 </table>
                             </div>