diff --git a/js/src/types/sorting.model.ts b/js/src/types/sorting.model.ts
new file mode 100644
index 000000000..57271875c
--- /dev/null
+++ b/js/src/types/sorting.model.ts
@@ -0,0 +1,19 @@
+import { EventSortField, SortDirection } from "./enums";
+
+export interface ISorting {
+  title: string;
+  orderBy: EventSortField;
+  direction: SortDirection;
+}
+
+export class SortingUpcoming implements ISorting {
+  title = "Upcoming Events";
+  orderBy = EventSortField.BEGINS_ON;
+  direction = SortDirection.ASC;
+}
+
+export class SortingCreated implements ISorting {
+  title = "Recently created Events";
+  orderBy = EventSortField.INSERTED_AT;
+  direction = SortDirection.DESC;
+}
diff --git a/js/src/views/Home.vue b/js/src/views/Home.vue
index 8bb25d623..24034e735 100644
--- a/js/src/views/Home.vue
+++ b/js/src/views/Home.vue
@@ -51,15 +51,7 @@
     >
       <section class="events-recent">
         <h2 class="title">
-          {{
-            $t(
-              config &&
-                config.instanceHomepageSorting ===
-                  InstanceHomepageSorting.UPCOMING
-                ? "Upcoming Events"
-                : "Last published events"
-            )
-          }}
+          {{ $t(this.sorting.title) }}
         </h2>
         <p>
           <i18n tag="span" path="On {instance} and other federated instances">
@@ -297,15 +289,7 @@
       />
       <section class="events-recent">
         <h2 class="title">
-          {{
-            $t(
-              config &&
-                config.instanceHomepageSorting ===
-                  InstanceHomepageSorting.UPCOMING
-                ? "Upcoming Events"
-                : "Last published events"
-            )
-          }}
+          {{ $t(this.sorting.title) }}
         </h2>
         <p>
           <i18n tag="span" path="On {instance} and other federated instances">
@@ -337,12 +321,7 @@
 
 <script lang="ts">
 import { Component, Vue, Watch } from "vue-property-decorator";
-import {
-  EventSortField,
-  InstanceHomepageSorting,
-  ParticipantRole,
-  SortDirection,
-} from "@/types/enums";
+import { InstanceHomepageSorting, ParticipantRole } from "@/types/enums";
 import { Paginate } from "@/types/paginate";
 import { supportsWebPFormat } from "@/utils/support";
 import { IParticipant, Participant } from "../types/participant.model";
@@ -362,6 +341,11 @@ import RouteName from "../router/name";
 import { IEvent } from "../types/event.model";
 import DateComponent from "../components/Event/DateCalendarIcon.vue";
 import { CONFIG } from "../graphql/config";
+import {
+  ISorting,
+  SortingCreated,
+  SortingUpcoming,
+} from "../types/sorting.model";
 import { IConfig } from "../types/config.model";
 import { IFollowedGroupEvent } from "../types/followedGroupEvent.model";
 import Subtitle from "../components/Utils/Subtitle.vue";
@@ -371,16 +355,7 @@ import Subtitle from "../components/Utils/Subtitle.vue";
     events: {
       query: FETCH_EVENTS,
       variables() {
-        return this.config?.instanceHomepageSorting ===
-          InstanceHomepageSorting.UPCOMING
-          ? {
-              orderBy: EventSortField.BEGINS_ON,
-              direction: SortDirection.ASC,
-            }
-          : {
-              orderBy: EventSortField.INSERTED_AT,
-              direction: SortDirection.DESC,
-            };
+        return this.sorting;
       },
     },
     currentActor: {
@@ -549,6 +524,15 @@ export default class Home extends Vue {
     );
   }
 
+  get sorting(): ISorting {
+    switch (this.config?.instanceHomepageSorting) {
+      case InstanceHomepageSorting.UPCOMING:
+        return new SortingUpcoming();
+      default:
+        return new SortingCreated();
+    }
+  }
+
   get thisWeekGoingToEvents(): IParticipant[] {
     const res = this.currentUserParticipations.filter(
       ({ event, role }) =>