diff --git a/apps/frontend/src/routes/_dashboardLayout/assessment/index.lazy.tsx b/apps/frontend/src/routes/_dashboardLayout/assessment/index.lazy.tsx
index bb3e7b3..863b85d 100644
--- a/apps/frontend/src/routes/_dashboardLayout/assessment/index.lazy.tsx
+++ b/apps/frontend/src/routes/_dashboardLayout/assessment/index.lazy.tsx
@@ -436,22 +436,24 @@ export default function AssessmentPage() {
 
           {/* Navigasi dan Pagination */}
           <Flex direction="column" gap="xs" className="ml-4">
+
+            {/* Navigasi (Number of Questions) */}
             <div className="grid grid-cols-5 gap-2">
-              {paginatedQuestions.map((question, index) => {
+              {filteredQuestions.map((question, index) => {
                 const questionId = question.questionId;
                 if (!questionId) return null;
 
-                // Menentukan nomor soal berdasarkan pagination
-                const questionNumber = startIndex + index + 1; // Sesuaikan nomor berdasarkan halaman
+                // Menentukan nomor soal berdasarkan indeks pertanyaan yang difilter
+                const questionNumber = index + 1; // Nomor pertanyaan dimulai dari 1
 
                 return (
                   <div key={questionId} className="flex justify-center relative">
                     <button
                       className={`w-10 h-10 border rounded-lg flex items-center justify-center relative
-            ${flaggedQuestions[questionId] ? "text-black" : "bg-transparent text-black"}`}
+                        ${flaggedQuestions[questionId] ? "text-black" : "bg-transparent text-black"}`}
                       onClick={() => scrollToQuestion(questionId)}
                     >
-                      {questionNumber}
+                      {questionNumber} {/* Menampilkan nomor pertanyaan yang sudah difilter */}
                     </button>
 
                     {flaggedQuestions[questionId] && (