diff --git a/appinfo/routes.php b/appinfo/routes.php
index 7e9aadc5d..37977a684 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -8,6 +8,7 @@
 return [
 	'routes' => [
 		['name' => 'page#index', 'url' => '/', 'verb' => 'GET'],
+		['name' => 'page#indexUpcoming', 'url' => '/upcoming', 'verb' => 'GET'],
 		['name' => 'page#indexList', 'url' => '/board', 'verb' => 'GET'],
 		['name' => 'page#indexBoard', 'url' => '/board/{boardId}', 'verb' => 'GET'],
 		['name' => 'page#indexBoardDetails', 'url' => '/board/{boardId}/details', 'verb' => 'GET'],
diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
index 1b5304436..1cad27520 100644
--- a/lib/Controller/PageController.php
+++ b/lib/Controller/PageController.php
@@ -107,6 +107,12 @@ public function indexCard(int $cardId): TemplateResponse {
 		return $this->index();
 	}
 
+	#[NoAdminRequired]
+	#[NoCSRFRequired]
+	public function indexUpcoming(): TemplateResponse {
+		return $this->index();
+	}
+
 	#[NoAdminRequired]
 	#[NoCSRFRequired]
 	public function redirectToCard($cardId): RedirectResponse {
diff --git a/src/components/navigation/AppNavigation.vue b/src/components/navigation/AppNavigation.vue
index 86562bec3..e0cffe238 100644
--- a/src/components/navigation/AppNavigation.vue
+++ b/src/components/navigation/AppNavigation.vue
@@ -10,7 +10,7 @@
 				:exact="true"
 				to="/upcoming">
 				<template #icon>
-					<CalendarIcon v-if="$route.path === '/'" :size="20" />
+					<CalendarIcon v-if="$route.path === '/upcoming'" :size="20" />
 					<CalendarOutlineIcon v-else :size="20" />
 				</template>
 			</NcAppNavigationItem>
diff --git a/src/router.js b/src/router.js
index 7bca45457..6b7387ace 100644
--- a/src/router.js
+++ b/src/router.js
@@ -166,6 +166,9 @@ router.beforeEach((to, from, next) => {
 		if (defaultBoardId) {
 			next({ name: 'board', params: { id: parseInt(defaultBoardId, 10) } })
 			return
+		} else {
+			next({ name: 'upcoming' })
+			return
 		}
 	}
 	next()