diff --git a/planning/behavior_velocity_intersection_module/src/scene_intersection.cpp b/planning/behavior_velocity_intersection_module/src/scene_intersection.cpp
index cbccff29bc562..89cdeaae56723 100644
--- a/planning/behavior_velocity_intersection_module/src/scene_intersection.cpp
+++ b/planning/behavior_velocity_intersection_module/src/scene_intersection.cpp
@@ -1107,9 +1107,10 @@ IntersectionModule::DecisionResult IntersectionModule::modifyPathVelocityDetail(
                                                         occlusion_stop_line_idx};
     }
   } else {
-    const auto occlusion_stop_line = planner_param_.occlusion.temporal_stop_before_attention_area
-                                       ? first_attention_stop_line_idx
-                                       : occlusion_stop_line_idx;
+    const auto occlusion_stop_line =
+      (planner_param_.occlusion.temporal_stop_before_attention_area || !has_traffic_light_)
+        ? first_attention_stop_line_idx
+        : occlusion_stop_line_idx;
     return IntersectionModule::FirstWaitBeforeOcclusion{
       is_occlusion_cleared_with_margin, closest_idx, default_stop_line_idx, occlusion_stop_line};
   }