diff --git a/client/src/components/modules/Module.vue b/client/src/components/modules/Module.vue
index 4222df2d..1d08c249 100644
--- a/client/src/components/modules/Module.vue
+++ b/client/src/components/modules/Module.vue
@@ -61,7 +61,7 @@
     </div>
 
     <h3
-      v-if="$flavor.showObjectivesTitle && module.objectiveGroups.length && showObjectives"
+      v-if="$flavor.showObjectivesTitle && module.objectiveGroups?.length && showObjectives"
       id="objectives"
     >
       <span>Lernziele</span>
@@ -69,7 +69,7 @@
 
     <div
       class="module__objective-groups"
-      v-if="module.objectiveGroups.length && showObjectives"
+      v-if="module.objectiveGroups?.length && showObjectives"
     >
       <objective-groups
         :groups="languageCommunicationObjectiveGroups"
diff --git a/client/src/graphql/gql/queries/modules/moduleDetailsQuery.gql b/client/src/graphql/gql/queries/modules/moduleDetailsQuery.gql
index ece9419a..52d556a7 100644
--- a/client/src/graphql/gql/queries/modules/moduleDetailsQuery.gql
+++ b/client/src/graphql/gql/queries/modules/moduleDetailsQuery.gql
@@ -1,18 +1,10 @@
 #import "gql/fragments/chapterParts.gql"
-#import "gql/fragments/objectiveGroupParts.gql"
-#import "gql/fragments/objectiveParts.gql"
 #import "gql/fragments/moduleParts.gql"
 #import "gql/fragments/contentBlockInterfaceParts.gql"
 #import "gql/fragments/contentBlockParts.gql"
 query ModuleDetailsQuery($slug: String, $id: ID) {
   module(slug: $slug, id: $id) {
     ...ModuleLegacyParts
-    objectiveGroups {
-      ...ObjectiveGroupParts
-      objectives {
-        ...ObjectiveParts
-      }
-    }
     chapters {
       ...ChapterParts
       contentBlocks {