diff --git a/client/lib/filter.js b/client/lib/filter.js
index 082eb3be9..a79ae65cd 100644
--- a/client/lib/filter.js
+++ b/client/lib/filter.js
@@ -118,7 +118,7 @@ class DateFilter {
         .add(weekStartDay, 'days');
       var WeekEnd = WeekStart
         .clone()
-        .add(offset, 'week')
+        .add(6, 'days')
         .endOf('day');
 
       this._updateState('thisweek');
@@ -130,7 +130,7 @@ class DateFilter {
         .add(weekStartDay + 7, 'days');
       var WeekEnd = WeekStart
         .clone()
-        .add(offset, 'week')
+        .add(6, 'days')
         .endOf('day');
 
      this._updateState('nextweek');