diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang/AverageGrade.js b/public/js/components/Cis/Mylv/AverageGrade.js
similarity index 94%
rename from public/js/components/Cis/Mylv/Semester/Studiengang/AverageGrade.js
rename to public/js/components/Cis/Mylv/AverageGrade.js
index ab43e0787..5978f68e6 100644
--- a/public/js/components/Cis/Mylv/Semester/Studiengang/AverageGrade.js
+++ b/public/js/components/Cis/Mylv/AverageGrade.js
@@ -1,5 +1,5 @@
-import Phrasen from "../../../../../mixins/Phrasen.js";
-import ApiLehre from "../../../../../api/factory/lehre.js";
+import Phrasen from "../../../mixins/Phrasen.js";
+import ApiLehre from "../../../api/factory/lehre.js";
 
 export default {
 	mixins: [
diff --git a/public/js/components/Cis/Mylv/Lvs.js b/public/js/components/Cis/Mylv/Lvs.js
index 536a03384..ccda92234 100644
--- a/public/js/components/Cis/Mylv/Lvs.js
+++ b/public/js/components/Cis/Mylv/Lvs.js
@@ -1,12 +1,15 @@
 import MylvSemesterCards from "./Semester.js";
 import MylvTable from "./Table.js";
+import MylvSemesterStudiengangAverageGrade from "./AverageGrade.js";
 
 export default {
 	name: "Lvs",
 	components: {
 		MylvSemesterCards,
-		MylvTable
+		MylvTable,
+		MylvSemesterStudiengangAverageGrade,
 	},
+	inject: ['isStudent'],
 	props: ["current"],
 	data() {
 		return {
@@ -39,8 +42,20 @@ export default {
 				<i class="fa fa-table"></i>
 			</button>
 		</div>
-		<mylv-semester-cards v-if="mode == 'cards'" v-bind="$props.current"/>
-		<mylv-table v-else-if="mode == 'table'" v-bind="$props.current"/>
+		<mylv-semester-cards v-if="mode == 'cards'" v-bind="$props.current">
+			<template #averageGrade v-if="isStudent && $props.current.semester">
+				<mylv-semester-studiengang-average-grade
+					:semesterInfo="$props.current.semester"
+				/>
+			</template>
+		</mylv-semester-cards>
+		<mylv-table v-else-if="mode == 'table'" v-bind="$props.current">
+			<template #averageGrade v-if="isStudent && $props.current.semester">
+				<mylv-semester-studiengang-average-grade
+					:semesterInfo="$props.current.semester"
+				/>
+			</template>
+		</mylv-table>
 	</div>
 	`,
 }
\ No newline at end of file
diff --git a/public/js/components/Cis/Mylv/Semester.js b/public/js/components/Cis/Mylv/Semester.js
index f774be506..6305dfbdb 100644
--- a/public/js/components/Cis/Mylv/Semester.js
+++ b/public/js/components/Cis/Mylv/Semester.js
@@ -37,9 +37,19 @@ export default {
 			return this.lvs.filter(lv => lv.studiengang_kz == studiengang.studiengang_kz && lv.semester == studiengang.semester);
 		}
 	},
-	template: `
+	template: /*html*/ `
 	<div class="mylv-semester" v-if="ready">
-		<mylv-semester-studiengang v-for="studiengang in studiengaenge" :key="studiengang.studiengang_kz" v-bind="studiengang" :lvs="lvsForStudiengang(studiengang)" :semesterInfo="$props.semester" />
+		<mylv-semester-studiengang
+			v-for="studiengang in studiengaenge"
+			:key="studiengang.studiengang_kz"
+			v-bind="studiengang"
+			:lvs="lvsForStudiengang(studiengang)"
+			:semesterInfo="$props.semester"
+		>
+			<template #averageGrade>
+				<slot name="averageGrade"></slot>
+			</template>
+		</mylv-semester-studiengang>
 	</div>
 	<div class="mylv-semester text-center" v-else>
 		<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang.js b/public/js/components/Cis/Mylv/Semester/Studiengang.js
index c026f952f..b085b5ce2 100644
--- a/public/js/components/Cis/Mylv/Semester/Studiengang.js
+++ b/public/js/components/Cis/Mylv/Semester/Studiengang.js
@@ -1,5 +1,4 @@
 import MylvSemesterStudiengangLv from "./Studiengang/Lv.js";
-import MylvSemesterStudiengangAverageGrade from "./Studiengang/AverageGrade.js";
 import Phrasen from "../../../../mixins/Phrasen.js";
 
 import ApiAuthinfo from '../../../../api/factory/authinfo.js';
@@ -8,7 +7,6 @@ export default {
 	name: 'Studiengang',
 	components: {
 		MylvSemesterStudiengangLv,
-		MylvSemesterStudiengangAverageGrade
 	},
 	mixins: [
 		Phrasen
@@ -21,11 +19,6 @@ export default {
 		lvs: Array,
 		sg_bezeichnung_eng: String
 	},
-	data() {
-		return {
-			isAverageGradeDisplayed: false,
-		}
-	},
 	computed: {
 		lehrveranstaltungen() {
 			return [... new Map(
@@ -41,16 +34,8 @@ export default {
 		note(lv) {
 			return lv.benotung ? lv.znote || lv.lvnote || null : null;
 		},
-		async checkIfAverageGradeIsDisplayed() {
-			const authInfoResponse = await this.$api.call(ApiAuthinfo.getAuthInfo());
-			const authInfo = authInfoResponse.data;
-			this.isAverageGradeDisplayed = !!authInfo.isStudent;
-		},
 	},
-	created() {
-		this.checkIfAverageGradeIsDisplayed();
-	},
-	template: `
+	template: /*html*/ `
 	<div class="card mb-3">
 		<div class="card-body">
 			<h4 class="card-title mb-3">{{$p.user_language.value === 'English' ? sg_bezeichnung_eng : bezeichnung}} - {{kuerzel}}
@@ -61,7 +46,7 @@ export default {
 					<mylv-semester-studiengang-lv v-bind="lv" class="text-center h-100"></mylv-semester-studiengang-lv>
 				</div>
 			</div>
-			<mylv-semester-studiengang-average-grade v-if="isAverageGradeDisplayed" :semesterInfo="$props.semesterInfo" />
+			<slot name="averageGrade"></slot>
 		</div>
 	</div>`
 };
diff --git a/public/js/components/Cis/Mylv/Table.js b/public/js/components/Cis/Mylv/Table.js
index ed4057753..6e0142bc3 100644
--- a/public/js/components/Cis/Mylv/Table.js
+++ b/public/js/components/Cis/Mylv/Table.js
@@ -325,22 +325,25 @@ export default {
 			deep: true
 		}
 	},
-	template: `
-	<div class="mylv-semester-table" v-if="ready">
-		 <core-filter-cmpt
-			v-if="phrasenResolved"
-			@uuidDefined="handleUuidDefined"
-			:title="''"
-			ref="mylvTable"
-			:tabulator-options="mylvTableOptions"
-			:tabulator-events="mylvTableEventHandlers"
-			@tableBuilt="handleTableBuilt"
-			tableOnly
-			:sideMenu="false"
-		 />
-	</div>
-	<div v-if="tabulatorUuid === null" class="text-center d-flex justify-content-center align-items-center h-100" >
-		<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
+	template: /*html*/ `
+	<div class="d-flex flex-column gap-3">
+		<div class="mylv-semester-table" v-if="ready">
+			<core-filter-cmpt
+				v-if="phrasenResolved"
+				@uuidDefined="handleUuidDefined"
+				:title="''"
+				ref="mylvTable"
+				:tabulator-options="mylvTableOptions"
+				:tabulator-events="mylvTableEventHandlers"
+				@tableBuilt="handleTableBuilt"
+				tableOnly
+				:sideMenu="false"
+			/>
+		</div>
+		<div v-if="tabulatorUuid === null" class="text-center d-flex justify-content-center align-items-center h-100" >
+			<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
+		</div>
+		<slot name="averageGrade"></slot>
 	</div>
 	`
 };
\ No newline at end of file