diff --git a/app/Http/Controllers/LaporanHasilPenilaianJaminanInternalExternalController.php b/app/Http/Controllers/LaporanHasilPenilaianJaminanInternalExternalController.php
index 3bac546..081d455 100644
--- a/app/Http/Controllers/LaporanHasilPenilaianJaminanInternalExternalController.php
+++ b/app/Http/Controllers/LaporanHasilPenilaianJaminanInternalExternalController.php
@@ -190,7 +190,7 @@
             $pageCount = ceil($totalRecords / $request->get('size'));
 
             // Calculate the current page number
-            $currentPage = $request->get('page', 1);
+            $currentPage = $request->get('page') ?: 1;
 
             // Return the response data as a JSON object
             return response()->json([
diff --git a/resources/views/laporan_hasil_penilaian_jaminan_internal_external/index.blade.php b/resources/views/laporan_hasil_penilaian_jaminan_internal_external/index.blade.php
index f67fb41..bc59c17 100644
--- a/resources/views/laporan_hasil_penilaian_jaminan_internal_external/index.blade.php
+++ b/resources/views/laporan_hasil_penilaian_jaminan_internal_external/index.blade.php
@@ -219,10 +219,19 @@
                             </th>
                         </tr>
                         </thead>
-                        <tbody data-datatable-body="true">
-                        </tbody>
                     </table>
                 </div>
+                <div class="card-footer justify-center md:justify-between flex-col md:flex-row gap-3 text-gray-600 text-2sm font-medium">
+                    <div class="flex items-center gap-2">
+                        Show
+                        <select class="select select-sm w-16" data-datatable-size="true" name="perpage"> </select> per page
+                    </div>
+                    <div class="flex items-center gap-4">
+                        <span data-datatable-info="true"> </span>
+                        <div class="pagination" data-datatable-pagination="true">
+                        </div>
+                    </div>
+                </div>
             </div>
         </div>
     </div>
@@ -437,6 +446,7 @@
 
         // Update export URL with filters
         function updateExportUrl() {
+            dataTable.goPage(1);
             let url = new URL(exportBtn.href);
 
             if (startDateInput.value) {