diff --git a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
index eb27412a1..159cc77b3 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
@@ -408,7 +408,7 @@ export const AbgabeStudentDetail = {
 			if(this.isViewMode) {
 				return { value: this.$capitalize(this.$p.t('abgabetool/c4studentAbgabeNotAllowedInViewMode')), class: "custom-tooltip" }
 			} else {
-				return { value: this.$capitalize(this.$p.t('abgabetool/c4studentAbgabeNotAllowedRegularv2')), class: "custom-tooltip" }
+				return { value: this.$capitalize(this.$p.t('abgabetool/c4studentAbgabeNotAllowedRegularv3')), class: "custom-tooltip" }
 			}
 		},
 		getTooltipBeurteilungerforderlich() {
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index bdba6c191..1e44a90ca 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -187,7 +187,9 @@ export const AbgabetoolStudent = {
 					termin.file = []
 					termin.allowedToUpload = false
 
-					if(termin.paabgabetyp_kurzbz == 'end') {
+					if(termin.note) { // quality gate termin already has note
+						termin.allowedToUpload = false
+					} else if(termin.paabgabetyp_kurzbz == 'end') {
 						const inTime = termin.fixtermin ? !this.isPastDate(termin.datum) : true
 						termin.allowedToUpload = inTime && this.checkQualityGatesOptional(pa.abgabetermine)
 					} else if(termin.fixtermin) {