diff --git a/planning/autoware_costmap_generator/src/utils/objects_to_costmap.cpp b/planning/autoware_costmap_generator/src/utils/objects_to_costmap.cpp
index 64f558b4f5604..6b1f4331f55ad 100644
--- a/planning/autoware_costmap_generator/src/utils/objects_to_costmap.cpp
+++ b/planning/autoware_costmap_generator/src/utils/objects_to_costmap.cpp
@@ -200,10 +200,10 @@ grid_map::Matrix ObjectsToCostmap::makeCostmapFromObjects(
     grid_map::Polygon polygon;
     if (object.shape.type == autoware_perception_msgs::msg::Shape::POLYGON) {
       polygon = makePolygonFromObjectConvexHull(in_objects->header, object, expand_polygon_size);
-    } else if (object.shape.type == autoware_perception_msgs::msg::Shape::BOUNDING_BOX) {
+    } else if (object.shape.type == autoware_perception_msgs::msg::Shape::BOUNDING_BOX) {  // NOLINT
       polygon = makePolygonFromObjectBox(in_objects->header, object, expand_polygon_size);
     } else if (object.shape.type == autoware_perception_msgs::msg::Shape::CYLINDER) {
-      // TODO(Kenji Miyake): Add makePolygonFromObjectCylinder
+      // TODO(Kenji Miyake): Add makePolygonFromObjectCylinder and remove NOLINT
       polygon = makePolygonFromObjectBox(in_objects->header, object, expand_polygon_size);
     }
     const auto highest_probability_label = *std::max_element(