diff --git a/src/registrasi-sidsem/registrasi-sidsem.service.ts b/src/registrasi-sidsem/registrasi-sidsem.service.ts
index c803fb8be3aa8f4cf992908731be07a0cc8103f1..20053bcdd17314dfe3b30614498258998026a830 100644
--- a/src/registrasi-sidsem/registrasi-sidsem.service.ts
+++ b/src/registrasi-sidsem/registrasi-sidsem.service.ts
@@ -221,8 +221,7 @@ export class RegistrasiSidsemService {
       .leftJoin("pt.dosenBimbingan", "dosenBimbingan")
       .leftJoin("dosenBimbingan.dosen", "dosen")
       .leftJoin("pt.mahasiswa", "mahasiswa")
-      .where("mahasiswa.aktif = true")
-      .orderBy("ps.waktuPengiriman", "DESC");
+      .where("mahasiswa.aktif = true");
 
     if (idPembimbing) {
       baseQuery
@@ -268,7 +267,7 @@ export class RegistrasiSidsemService {
 
     if (query.limit) {
       baseQuery.take(query.limit);
-      baseQuery.skip((query.page - 1) * query.limit);
+      baseQuery.skip(((query.page ?? 1) - 1) * query.limit);
     }
 
     const [queryData, total] = await baseQuery.getManyAndCount();