diff --git a/apps/frontend/src/modules/assessmentManagement/queries/assessmentQueries.ts b/apps/frontend/src/modules/assessmentManagement/queries/assessmentQueries.ts
index 6c46b5c..788f5c5 100644
--- a/apps/frontend/src/modules/assessmentManagement/queries/assessmentQueries.ts
+++ b/apps/frontend/src/modules/assessmentManagement/queries/assessmentQueries.ts
@@ -8,6 +8,7 @@ type SubmitOptionResponse = {
         id: string;
         createdAt: string | null;
         validationInformation: string;
+        isFlagged: boolean | null;
     };
 };
 
@@ -73,19 +74,18 @@ export const getAllAnswer = (assessmentId: string) =>
     });
 
 // Query untuk toggle flag jawaban berdasarkan questionId
-export const toggleFlagAnswer = async (questionId: string) => {
+export const toggleFlagAnswer = async (form: {
+    assessmentId: string;
+    questionId: string;
+    isFlagged: boolean;
+}): Promise<SubmitOptionResponse> => {
     return await fetchRPC(
-        client.assessments[":questionId"].toggleFlag.$patch({
-            param: { questionId },
+        client.assessments.toggleFlag.$patch({
+            json: form,
         })
     );
 };
 
-// Opsional: Jika Anda ingin menggunakan react-query untuk toggleFlag
-export const toggleFlagAnswerMutationOptions = (questionId: string) => ({
-    mutationFn: () => toggleFlagAnswer(questionId),
-});
-
 // Query untuk mendapatkan rata-rata skor berdasarkan aspectId dan assessmentId
 export const getAverageScoreQueryOptions = (assessmentId: string) =>
     queryOptions({