diff --git a/src/frontend/components/form-group/date-range/_date-range.scss b/src/frontend/components/form-group/date-range/_date-range.scss
index b8f9c3c98..66f752c1e 100644
--- a/src/frontend/components/form-group/date-range/_date-range.scss
+++ b/src/frontend/components/form-group/date-range/_date-range.scss
@@ -1,3 +1,13 @@
+div[data-column-type="daterange"] {
+  &:has(input[required]) {
+    legend {
+      &::after {
+        content: "*";
+      }
+    }
+  }
+}
+
 .input-daterange {
   .input .form-control {
     margin-top: 0;
diff --git a/views/fields/daterange.tt b/views/fields/daterange.tt
index ec53f65f7..4bcba8b0e 100644
--- a/views/fields/daterange.tt
+++ b/views/fields/daterange.tt
@@ -7,7 +7,7 @@
 <div class="form-group">
 [% END %]
   <fieldset class="fieldset"[% IF fieldset_name %] data-name="[% fieldset_name %]"[% END %][% fieldset_style %]>
-    [% INCLUDE fields/sub/label_fieldset.tt; %]
+    [% IF label; INCLUDE fields/sub/label_fieldset.tt; END; %]
     <div class="input-group input-daterange [% input_class %]"[% daterange_style %]>
       [%
         INCLUDE fields/input.tt