diff --git a/apps/frontend/src/routes/_dashboardLayout/assessment/index.lazy.tsx b/apps/frontend/src/routes/_dashboardLayout/assessment/index.lazy.tsx
index 5ac8630..d7959ad 100644
--- a/apps/frontend/src/routes/_dashboardLayout/assessment/index.lazy.tsx
+++ b/apps/frontend/src/routes/_dashboardLayout/assessment/index.lazy.tsx
@@ -387,13 +387,18 @@ export default function AssessmentPage() {
                             }));
                             toggleFlagMutation.mutate(questionId);
                           }}
-                          title="Tandai"
+                          title={
+                            !answers[question.questionId] 
+                              ? "Pilih jawaban terlebih dahulu"
+                              : "Tandai"
+                          }
                           color={flaggedQuestions[questionId] ? "red" : "white"}
                           style={{
-                            border: "1px gray solid ",
+                            border: "1px gray solid",
                             borderRadius: "4px",
                             backgroundColor: flaggedQuestions[questionId] ? "red" : "white",
                           }}
+                          disabled={!answers[question.questionId]}
                         >
                           <TbFlagFilled
                             size={20}
@@ -434,7 +439,10 @@ export default function AssessmentPage() {
                         <Text color="red">Tidak ada opsi untuk pertanyaan ini.</Text>
                       )}
 
-                      <Textarea placeholder="Berikan keterangan terkait jawaban di atas" />
+                      <Textarea
+                        placeholder="Berikan keterangan terkait jawaban di atas"
+                        disabled={!answers[question.questionId]}
+                      />
 
                       {/* File Upload */}
                       {question.needFile === true && (
@@ -466,6 +474,7 @@ export default function AssessmentPage() {
                             onChange={handleFileChange}
                             style={{ display: "none" }}
                             accept="image/png, image/jpeg, application/pdf"
+                            disabled={!answers[question.questionId]}
                           />
                         </div>
                       )}