diff --git a/src/views/tasks/ShowTasks.vue b/src/views/tasks/ShowTasks.vue
index 6333fcb8..ee8f9dcd 100644
--- a/src/views/tasks/ShowTasks.vue
+++ b/src/views/tasks/ShowTasks.vue
@@ -47,6 +47,10 @@ import {LOADING, LOADING_MODULE} from '@/store/mutation-types'
 import LlamaCool from '@/assets/llama-cool.svg?component'
 import DatepickerWithRange from '@/components/date/datepickerWithRange'
 
+function getNextWeekDate() {
+	return new Date((new Date()).getTime() + 7 * 24 * 60 * 60 * 1000)
+}
+
 export default {
 	name: 'ShowTasks',
 	components: {
@@ -62,8 +66,6 @@ export default {
 		}
 	},
 	props: {
-		startDate: Date,
-		endDate: Date,
 		showAll: Boolean,
 	},
 	created() {
@@ -84,14 +86,14 @@ export default {
 
 			return !isNaN(d)
 				? d
-				: this.startDate
+				: new Date()
 		},
 		dateTo() {
 			const d = new Date(Number(this.$route.query.to))
 
 			return !isNaN(d)
 				? d
-				: this.endDate
+				: getNextWeekDate()
 		},
 		showNulls() {
 			return this.$route.query.showNulls === 'true'
diff --git a/src/views/tasks/ShowTasksInRange.vue b/src/views/tasks/ShowTasksInRange.vue
deleted file mode 100644
index 02498cc1..00000000
--- a/src/views/tasks/ShowTasksInRange.vue
+++ /dev/null
@@ -1,20 +0,0 @@
-<template>
-	<div class="content has-text-centered">
-		<ShowTasks
-			:end-date="endDate"
-			:start-date="startDate"
-		/>
-	</div>
-</template>
-
-<script lang="ts" setup>
-import { ref } from 'vue'
-import ShowTasks from './ShowTasks.vue'
-
-function getNextWeekDate() {
-	return new Date((new Date()).getTime() + 7 * 24 * 60 * 60 * 1000)
-}
-
-const startDate = ref(new Date())
-const endDate = ref(getNextWeekDate())
-</script>
\ No newline at end of file
diff --git a/src/views/tasks/UpcomingTasks.vue b/src/views/tasks/UpcomingTasks.vue
new file mode 100644
index 00000000..46b823cb
--- /dev/null
+++ b/src/views/tasks/UpcomingTasks.vue
@@ -0,0 +1,9 @@
+<template>
+	<div class="content has-text-centered">
+		<ShowTasks/>
+	</div>
+</template>
+
+<script lang="ts" setup>
+import ShowTasks from './ShowTasks.vue'
+</script>
\ No newline at end of file