diff --git a/src/app/modules/catalog/catalog.component.ts b/src/app/modules/catalog/catalog.component.ts
index 73b0eb9d..58ebbdc4 100644
--- a/src/app/modules/catalog/catalog.component.ts
+++ b/src/app/modules/catalog/catalog.component.ts
@@ -117,8 +117,9 @@ export class CatalogComponent implements OnInit, OnDestroy {
       semester => semester.startDate <= today && semester.endDate > today,
     );
     const currentSemesterIndex = semesters.findIndex(semester => semester.uid === currentSemester?.uid);
-    this.availableSemesters = semesters.slice(currentSemesterIndex - 1, currentSemesterIndex + 2).reverse();
-
+    this.availableSemesters = semesters
+      .slice(Math.max(0, currentSemesterIndex - 1), Math.min(currentSemesterIndex + 2, semesters.length))
+      .reverse();
     if (typeof this.activeSemester !== 'undefined') {
       return;
     }
diff --git a/src/app/modules/catalog/catalog.provider.ts b/src/app/modules/catalog/catalog.provider.ts
index f44c0f4e..58a81ac4 100644
--- a/src/app/modules/catalog/catalog.provider.ts
+++ b/src/app/modules/catalog/catalog.provider.ts
@@ -121,11 +121,11 @@ export class CatalogProvider {
               arguments: {
                 bounds: {
                   lowerBound: {
-                    limit: `${new Date().setFullYear(new Date().getFullYear() - 1)}`,
+                    limit: `${new Date(new Date().setFullYear(new Date().getFullYear() - 1)).toISOString}`,
                     mode: 'inclusive',
                   },
                   upperBound: {
-                    limit: `${new Date().setFullYear(new Date().getFullYear() + 1)}`,
+                    limit: `${new Date(new Date().setFullYear(new Date().getFullYear() + 1)).toISOString}`,
                     mode: 'inclusive',
                   },
                 },