diff --git a/src/store/dashboard.js b/src/store/dashboard.js
index cc74d0d9b9..f316410b61 100644
--- a/src/store/dashboard.js
+++ b/src/store/dashboard.js
@@ -17,7 +17,7 @@ export default {
 	},
 	getters: {
 		assignedCardsDashboard: state => {
-			return Object.values(state.assignedCards).flat()
+			return state.assignedCards
 		},
 	},
 	mutations: {
diff --git a/src/views/DashboardToday.vue b/src/views/DashboardToday.vue
index 0df294890c..58ab61b65f 100644
--- a/src/views/DashboardToday.vue
+++ b/src/views/DashboardToday.vue
@@ -40,14 +40,7 @@ export default {
 			'assignedCardsDashboard',
 		]),
 		cards() {
-			const today = new Date()
-			const list = [
-				...this.assignedCardsDashboard,
-			].filter((card) => {
-				return card.duedate !== null
-			}).filter((card) => {
-				return (new Date(card.duedate)).getDate() === (new Date(today)).getDate()
-			})
+			const list = [...this.assignedCardsDashboard.today || []]
 			list.sort((a, b) => {
 				return (new Date(a.duedate)).getTime() - (new Date(b.duedate)).getTime()
 			})
diff --git a/src/views/DashboardTomorrow.vue b/src/views/DashboardTomorrow.vue
index ce134ef5ac..3996a695ab 100644
--- a/src/views/DashboardTomorrow.vue
+++ b/src/views/DashboardTomorrow.vue
@@ -40,15 +40,7 @@ export default {
 			'assignedCardsDashboard',
 		]),
 		cards() {
-			const tomorrow = new Date()
-			tomorrow.setDate(tomorrow.getDate() + 1)
-			const list = [
-				...this.assignedCardsDashboard,
-			].filter((card) => {
-				return card.duedate !== null
-			}).filter((card) => {
-				return (new Date(card.duedate)).getDate() === (new Date(tomorrow)).getDate()
-			})
+			const list = [...this.assignedCardsDashboard.tomorrow || []]
 			list.sort((a, b) => {
 				return (new Date(a.duedate)).getTime() - (new Date(b.duedate)).getTime()
 			})
diff --git a/src/views/DashboardUpcoming.vue b/src/views/DashboardUpcoming.vue
index 8b5e729822..ca14274971 100644
--- a/src/views/DashboardUpcoming.vue
+++ b/src/views/DashboardUpcoming.vue
@@ -59,11 +59,10 @@ export default {
 			'assignedCardsDashboard',
 		]),
 		cards() {
-			const list = [
-				...this.assignedCardsDashboard,
-			].filter((card) => {
-				return card.duedate !== null
-			})
+			const list = Object.values(this.assignedCardsDashboard).flat()
+				.filter((card) => {
+					return card.duedate !== null
+				})
 			list.sort((a, b) => {
 				return (new Date(a.duedate)).getTime() - (new Date(b.duedate)).getTime()
 			})