diff --git a/src/daterangepicker/daterangepicker.component.ts b/src/daterangepicker/daterangepicker.component.ts
index 4a29b898..7988f407 100644
--- a/src/daterangepicker/daterangepicker.component.ts
+++ b/src/daterangepicker/daterangepicker.component.ts
@@ -580,6 +580,18 @@ export class DaterangepickerComponent implements OnInit {
             this.endDate = this.startDate.clone();
             this.calculateChosenLabel();
         }
+        if (this.isInvalidDate && this.startDate && this.endDate) {
+            // get if there are invalid date between range
+            let d = this.startDate.clone();
+            while(d.isBefore(this.endDate)) {
+                if (this.isInvalidDate(d)) {
+                    this.endDate = d.subtract(1, 'days');
+                    this.calculateChosenLabel();
+                    break;
+                }
+                d.add(1, 'days');
+            }
+        }
         if (this.chosenLabel) {
             this.choosedDate.emit({chosenLabel: this.chosenLabel, startDate: this.startDate, endDate: this.endDate});
         }