diff --git a/app/citizen-frontend/src/components/layout/DefaultLayout.vue b/app/citizen-frontend/src/components/layout/DefaultLayout.vue
index 61ece22..6e871c5 100644
--- a/app/citizen-frontend/src/components/layout/DefaultLayout.vue
+++ b/app/citizen-frontend/src/components/layout/DefaultLayout.vue
@@ -113,7 +113,7 @@
         /> -->
 
         <v-list-item
-          v-if="SELF_ASSESSMENT_ENABLED"
+          v-if="SELF_ASSESSMENT_ENABLED && store.isLoggedIn"
           color="primary"
           prepend-icon="mdi-clipboard-text-search"
           title="自評"
@@ -222,7 +222,7 @@
       </v-btn>
 
       <v-btn
-        v-if="SELF_ASSESSMENT_ENABLED"
+        v-if="SELF_ASSESSMENT_ENABLED && store.isLoggedIn"
         to="/self-assessment"
         value="self-assessment"
       >
diff --git a/app/citizen-frontend/src/pages/index.vue b/app/citizen-frontend/src/pages/index.vue
index b990921..c5921cd 100644
--- a/app/citizen-frontend/src/pages/index.vue
+++ b/app/citizen-frontend/src/pages/index.vue
@@ -172,35 +172,6 @@
 
         <v-card class="rounded-xl elevation-2 mb-4 py-4" color="surface">
           <v-card-text>
-            <template v-if="SELF_ASSESSMENT_ENABLED">
-              <div class="d-flex align-center mb-4">
-                <v-avatar class="mr-4 text-white" color="accent" size="36">
-                  <v-icon icon="mdi-clipboard-text-outline" />
-                </v-avatar>
-
-                <div class="text-left">
-                  <div class="text-title-medium font-weight-bold text-primary">
-                    無須登入，先做線上自評
-                  </div>
-
-                  <div class="text-title-small text-grey mt-2">
-                    約 3 分鐘完成，取得初步健康風險分級。
-                  </div>
-                </div>
-              </div>
-
-              <v-btn
-                block
-                class="rounded-lg font-weight-bold elevation-1 mb-3"
-                color="secondary"
-                prepend-icon="mdi-clipboard-text-search"
-                to="/self-assessment"
-                variant="flat"
-              >
-                開始自評
-              </v-btn>
-            </template>
-
             <v-row density="compact">
               <v-col cols="12" md="6">
                 <v-btn
@@ -388,7 +359,6 @@ import {
   BODY_COMPOSITION_ENABLED,
   CHECKIN_ENABLED,
   RADAR_ENABLED,
-  SELF_ASSESSMENT_ENABLED,
 } from "@/config/features";
 import { useAppStore } from "@/stores/app";
 import { useCourseStore } from "@/stores/course";
diff --git a/app/citizen-frontend/src/pages/login.vue b/app/citizen-frontend/src/pages/login.vue
index c008ca3..6449f3f 100644
--- a/app/citizen-frontend/src/pages/login.vue
+++ b/app/citizen-frontend/src/pages/login.vue
@@ -86,18 +86,6 @@
               >
                 註冊新帳號
               </v-btn>
-
-              <v-btn
-                v-if="SELF_ASSESSMENT_ENABLED"
-                block
-                class="rounded-lg font-weight-bold"
-                color="primary"
-                prepend-icon="mdi-clipboard-text-search"
-                to="/self-assessment"
-                variant="outlined"
-              >
-                不登入，先做線上自評
-              </v-btn>
             </v-form>
             <!-- <div class="d-flex align-center justify-center my-4">
               <v-divider class="mr-3" />
@@ -153,7 +141,6 @@ import {
   isUnregisteredPhoneError,
 } from "@/utils/api-error";
 import { readGuestSelfAssessmentDraft } from "@/utils/guest-self-assessment";
-import { SELF_ASSESSMENT_ENABLED } from "@/config/features";
 
 const store = useAppStore();
 const router = useRouter();
diff --git a/app/citizen-frontend/src/router/index.ts b/app/citizen-frontend/src/router/index.ts
index 0cb12dd..605a117 100644
--- a/app/citizen-frontend/src/router/index.ts
+++ b/app/citizen-frontend/src/router/index.ts
@@ -51,6 +51,7 @@ const router = createRouter({
       path: "/self-assessment",
       name: "self-assessment",
       component: SelfAssessment,
+      meta: { requiresAuth: true },
     },
     {
       path: "/profile",