diff --git a/aleksis/apps/lesrooster/frontend/components/timetable_management/TimetableManagement.vue b/aleksis/apps/lesrooster/frontend/components/timetable_management/TimetableManagement.vue
index 3d8087083112b6f775dd6b66f5932a8533ef3503..443b5b536ebd1dc82d113f18e2507aea141c0adb 100644
--- a/aleksis/apps/lesrooster/frontend/components/timetable_management/TimetableManagement.vue
+++ b/aleksis/apps/lesrooster/frontend/components/timetable_management/TimetableManagement.vue
@@ -234,7 +234,8 @@ export default defineComponent({
   },
   computed: {
     readyForQueries() {
-      return this.internalTimeGrid !== null && this.selectedGroup !== null;
+      // Non-typesafe check to also handle undefined
+      return this.internalTimeGrid != null && this.selectedGroup != null && this.selectedGroup.id != null;
     },
     lessons() {
       return this.lessonObjects