diff --git a/daterangepicker.js b/daterangepicker.js
index 3657f481..2f6f71ea 100644
--- a/daterangepicker.js
+++ b/daterangepicker.js
@@ -489,7 +489,7 @@
                 this.endDate = moment(endDate);
 
             if (!this.timePicker)
-                this.endDate = this.endDate.add(1,'d').startOf('day').subtract(1,'second');
+                this.endDate = this.endDate.endOf('day');
 
             if (this.timePicker && this.timePickerIncrement)
                 this.endDate.minute(Math.round(this.endDate.minute() / this.timePickerIncrement) * this.timePickerIncrement);