diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.ts
index c2a0ebe29..eac8ee7cf 100644
--- a/apps/api/src/app/portfolio/portfolio.service.ts
+++ b/apps/api/src/app/portfolio/portfolio.service.ts
@@ -26,7 +26,8 @@ import {
   DATE_FORMAT,
   getAllActivityTypes,
   getSum,
-  parseDate
+  parseDate,
+  resetHours
 } from '@ghostfolio/common/helper';
 import {
   Accounts,
@@ -1625,44 +1626,34 @@ export class PortfolioService {
 
     switch (aDateRange) {
       case '1d':
-        startDate = max([
-          startDate,
-          subDays(new Date().setHours(0, 0, 0, 0), 1)
-        ]);
+        startDate = max([startDate, subDays(resetHours(new Date()), 1)]);
         break;
       case 'mtd':
         startDate = max([
           startDate,
-          subDays(startOfMonth(new Date().setHours(0, 0, 0, 0)), 1)
+          subDays(startOfMonth(resetHours(new Date())), 1)
         ]);
         break;
       case 'wtd':
         startDate = max([
           startDate,
-          subDays(
-            startOfWeek(new Date().setHours(0, 0, 0, 0), { weekStartsOn: 1 }),
-            1
-          )
+          subDays(startOfWeek(resetHours(new Date()), { weekStartsOn: 1 }), 1)
         ]);
         break;
       case 'ytd':
         startDate = max([
           startDate,
-          subDays(startOfYear(new Date().setHours(0, 0, 0, 0)), 1)
+          subDays(startOfYear(resetHours(new Date())), 1)
         ]);
         break;
       case '1y':
-        startDate = max([
-          startDate,
-          subYears(new Date().setHours(0, 0, 0, 0), 1)
-        ]);
+        startDate = max([startDate, subYears(resetHours(new Date()), 1)]);
         break;
       case '5y':
-        startDate = max([
-          startDate,
-          subYears(new Date().setHours(0, 0, 0, 0), 5)
-        ]);
+        startDate = max([startDate, subYears(resetHours(new Date()), 5)]);
         break;
+      default:
+        startDate = max([startDate, new Date(aDateRange)]);
     }
 
     return startDate;
diff --git a/apps/api/src/app/user/update-user-setting.dto.ts b/apps/api/src/app/user/update-user-setting.dto.ts
index 2e86f4622..db92b6bcb 100644
--- a/apps/api/src/app/user/update-user-setting.dto.ts
+++ b/apps/api/src/app/user/update-user-setting.dto.ts
@@ -41,7 +41,7 @@ export class UpdateUserSettingDto {
     'mtd',
     'wtd',
     'ytd',
-    ...eachYearOfInterval({ end: new Date(1900), start: new Date() }).map(
+    ...eachYearOfInterval({ end: new Date(), start: new Date(1900) }).map(
       (date) => {
         return format(date, 'yyyy');
       }