diff --git a/lib/content-services/i18n/en.json b/lib/content-services/i18n/en.json
index 108fdd2d89..effecc279a 100644
--- a/lib/content-services/i18n/en.json
+++ b/lib/content-services/i18n/en.json
@@ -182,8 +182,8 @@
       "RANGE": {
         "FROM": "From",
         "TO": "To",
-        "FROM-DATE": "Choose a date",
-        "TO-DATE": "Choose a date"
+        "FROM-DATE": "From",
+        "TO-DATE": "To"
       },
       "VALIDATION": {
         "REQUIRED-VALUE": "Required value",
diff --git a/lib/content-services/search/components/search-date-range/search-date-range.component.html b/lib/content-services/search/components/search-date-range/search-date-range.component.html
index b1cb62f0e0..f50400aeb0 100644
--- a/lib/content-services/search/components/search-date-range/search-date-range.component.html
+++ b/lib/content-services/search/components/search-date-range/search-date-range.component.html
@@ -3,7 +3,7 @@
         <input matInput [formControl]="from" [errorStateMatcher]="matcher"
                 placeholder="{{ 'SEARCH.FILTER.RANGE.FROM-DATE' | translate }}"
                 [matDatepicker]="fromDatepicker"
-                [max]="maxFrom"
+                [max]="maxDate"
                 (focusout)="onChangedHandler($event, from)">
         <mat-datepicker-toggle matSuffix [for]="fromDatepicker"></mat-datepicker-toggle>
         <mat-datepicker #fromDatepicker></mat-datepicker>
@@ -20,6 +20,7 @@
                 placeholder="{{ 'SEARCH.FILTER.RANGE.TO-DATE' | translate }}"
                 [matDatepicker]="toDatepicker"
                 [min]="from.value"
+                [max]="maxDate"
                 (focusout)="onChangedHandler($event, to)">
         <mat-datepicker-toggle matSuffix [for]="toDatepicker"></mat-datepicker-toggle>
         <mat-datepicker #toDatepicker></mat-datepicker>
@@ -29,6 +30,9 @@
         <mat-error *ngIf="to.hasError('matDatepickerMin')">
                 {{ 'SEARCH.FILTER.VALIDATION.NO-DAYS' | translate }}
         </mat-error>
+        <mat-error *ngIf="to.hasError('matDatepickerMax')">
+            {{ 'SEARCH.FILTER.VALIDATION.BEYOND-MAX-DATE' | translate }}
+        </mat-error>
     </mat-form-field>
 
     <div class="facet-buttons">
diff --git a/lib/content-services/search/components/search-date-range/search-date-range.component.ts b/lib/content-services/search/components/search-date-range/search-date-range.component.ts
index 13d9ed16b8..7480b28c70 100644
--- a/lib/content-services/search/components/search-date-range/search-date-range.component.ts
+++ b/lib/content-services/search/components/search-date-range/search-date-range.component.ts
@@ -69,7 +69,7 @@ export class SearchDateRangeComponent implements SearchWidget, OnInit {
     id: string;
     settings?: SearchWidgetSettings;
     context?: SearchQueryBuilderService;
-    maxFrom: any;
+    maxDate: any;
     datePickerDateFormat = DEFAULT_FORMAT_DATE;
 
     constructor(private dateAdapter: DateAdapter<Moment>,
@@ -99,7 +99,7 @@ export class SearchDateRangeComponent implements SearchWidget, OnInit {
             to: this.to
         });
 
-        this.maxFrom = moment().startOf('day');
+        this.maxDate = moment().startOf('day');
     }
 
     apply(model: { from: string, to: string }, isValid: boolean) {