diff --git a/core/themes/claro/css/components/form.css b/core/themes/claro/css/components/form.css
index 4f4edd8ab5..f2f9f5b4ec 100644
--- a/core/themes/claro/css/components/form.css
+++ b/core/themes/claro/css/components/form.css
@@ -123,7 +123,7 @@ tr .form-item,
   margin-bottom: calc(6rem / 16); /* 6px */
   color: var(--input--error-color);
   font-size: var(--font-size-xs); /* ~13px */
-  font-weight: normal;
+  font-weight: bold;
   line-height: calc(17rem / 16); /* 17px */
 }
 
diff --git a/core/themes/claro/css/components/form.pcss.css b/core/themes/claro/css/components/form.pcss.css
index 70f0c6574c..65a5e191e4 100644
--- a/core/themes/claro/css/components/form.pcss.css
+++ b/core/themes/claro/css/components/form.pcss.css
@@ -99,7 +99,7 @@ tr .form-item,
   margin-bottom: calc(6rem / 16); /* 6px */
   color: var(--input--error-color);
   font-size: var(--font-size-xs); /* ~13px */
-  font-weight: normal;
+  font-weight: bold;
   line-height: calc(17rem / 16); /* 17px */
 }
 
diff --git a/core/themes/claro/templates/datetime-wrapper.html.twig b/core/themes/claro/templates/datetime-wrapper.html.twig
index 4215b28ff2..229e8b6039 100644
--- a/core/themes/claro/templates/datetime-wrapper.html.twig
+++ b/core/themes/claro/templates/datetime-wrapper.html.twig
@@ -3,8 +3,6 @@
  * @file
  * Theme override of a datetime form wrapper.
  *
- * @todo Refactor when https://www.drupal.org/node/3010558 is fixed.
- *
  * @see template_preprocess_form_element()
  */
 #}
diff --git a/core/themes/claro/templates/form-element.html.twig b/core/themes/claro/templates/form-element.html.twig
index b474619df5..3991b26eff 100644
--- a/core/themes/claro/templates/form-element.html.twig
+++ b/core/themes/claro/templates/form-element.html.twig
@@ -3,8 +3,6 @@
  * @file
  * Theme override for a form element.
  *
- * @todo Remove when https://www.drupal.org/node/3010558 is fixed.
- *
  * @see template_preprocess_form_element()
  */
 #}