diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index d187423..51d10a7 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -582,8 +582,8 @@ function template_preprocess_datetime_wrapper(&$variables) {
     if (!empty($element['#id'])) {
       $description_attributes['id'] = $element['#id'] . '--description';
     }
-    $variables['description']['attributes'] = new Attribute($description_attributes);
-    $variables['description']['content'] = $element['#description'];
+    $variables['description'] = $element['#description'];
+    $variables['description_attributes'] = new Attribute($description_attributes);
   }
 
   $variables['required'] = FALSE;
diff --git a/core/modules/system/templates/datetime-wrapper.html.twig b/core/modules/system/templates/datetime-wrapper.html.twig
index d39df2f..27dfa4e 100644
--- a/core/modules/system/templates/datetime-wrapper.html.twig
+++ b/core/modules/system/templates/datetime-wrapper.html.twig
@@ -30,6 +30,8 @@
     {{ errors }}
   </div>
 {% endif %}
-{% if description.content %}
-  {{ description.content }}
+{% if description %}
+  <div{{ description_attributes.addClass('description') }}>
+    {{ description }}
+  </div>
 {% endif %}
diff --git a/core/themes/classy/templates/form/datetime-wrapper.html.twig b/core/themes/classy/templates/form/datetime-wrapper.html.twig
index a11c1e7..5b52f2d 100644
--- a/core/themes/classy/templates/form/datetime-wrapper.html.twig
+++ b/core/themes/classy/templates/form/datetime-wrapper.html.twig
@@ -29,8 +29,8 @@
     <strong>{{ errors }}</strong>
   </div>
 {% endif %}
-{% if description.content %}
-  <div{{ description.attributes.addClass('description') }}>
-    {{ description.content }}
+{% if description %}
+  <div{{ description_attributes.addClass('description') }}>
+    {{ description }}
   </div>
 {% endif %}
diff --git a/core/themes/stable/templates/form/datetime-wrapper.html.twig b/core/themes/stable/templates/form/datetime-wrapper.html.twig
index a89bd8d..8e04751 100644
--- a/core/themes/stable/templates/form/datetime-wrapper.html.twig
+++ b/core/themes/stable/templates/form/datetime-wrapper.html.twig
@@ -28,6 +28,8 @@
     {{ errors }}
   </div>
 {% endif %}
-{% if description.content %}
-  {{ description.content }}
+{% if description %}
+  <div{{ description_attributes.addClass('description') }}>
+    {{ description }}
+  </div>
 {% endif %}