diff --git a/src/main/java/org/olat/ims/qti21/ui/editor/AssessmentTestFeedbackEditorController.java b/src/main/java/org/olat/ims/qti21/ui/editor/AssessmentTestFeedbackEditorController.java
index 8b98737ccece7507a7eb225ccfae811ac6dd4b7f..5daf12c619c37b95c0ff109dfcb0072e7b94e4b2 100644
--- a/src/main/java/org/olat/ims/qti21/ui/editor/AssessmentTestFeedbackEditorController.java
+++ b/src/main/java/org/olat/ims/qti21/ui/editor/AssessmentTestFeedbackEditorController.java
@@ -131,24 +131,30 @@ public class AssessmentTestFeedbackEditorController extends FormBasicController
 
 		String passedTitle = feedbackPassedTitleEl.getValue();
 		String passedText = feedbackPassedTextEl.getRawValue();
+		TestFeedbackBuilder passedBuilder = testBuilder.getPassedFeedback();
 		if(StringHelper.containsNonWhitespace(FilterFactory.getHtmlTagsFilter().filter(passedText))) {
-			TestFeedbackBuilder passedBuilder = testBuilder.getPassedFeedback();
 			if(passedBuilder == null) {
 				passedBuilder = testBuilder.createPassedFeedback();
 			}
 			passedBuilder.setTitle(passedTitle);
 			passedBuilder.setText(passedText);
+		} else if(passedBuilder != null) {
+			passedBuilder.setTitle(null);
+			passedBuilder.setText(null);
 		}
 		
 		String failedTitle = feedbackFailedTitleEl.getValue();
 		String failedText = feedbackFailedTextEl.getRawValue();
+		TestFeedbackBuilder failedBuilder = testBuilder.getFailedFeedback();
 		if(StringHelper.containsNonWhitespace(FilterFactory.getHtmlTagsFilter().filter(failedText))) {
-			TestFeedbackBuilder failedBuilder = testBuilder.getFailedFeedback();
 			if(failedBuilder == null) {
 				failedBuilder = testBuilder.createFailedFeedback();
 			}
 			failedBuilder.setTitle(failedTitle);
 			failedBuilder.setText(failedText);
+		} else if(failedBuilder != null) {
+			failedBuilder.setTitle(null);
+			failedBuilder.setText(null);
 		}
 		
 		fireEvent(ureq, AssessmentTestEvent.ASSESSMENT_TEST_CHANGED_EVENT);