diff --git a/src/main/java/org/olat/course/nodes/InfoCourseNode.java b/src/main/java/org/olat/course/nodes/InfoCourseNode.java
index 62e8ca782b377926a89e5603d6603cc72897e6b1..e0056f1c3c9acd4956ed42e8b0541719e0e88a5d 100644
--- a/src/main/java/org/olat/course/nodes/InfoCourseNode.java
+++ b/src/main/java/org/olat/course/nodes/InfoCourseNode.java
@@ -207,7 +207,8 @@ public class InfoCourseNode extends AbstractAccessableCourseNode {
 	 */
 	public void cleanupOnDelete(ICourse course) {
 		// delete infoMessages and subscriptions (OLAT-6171)
-		List<InfoMessage>  messages = InfoMessageFrontendManager.getInstance().loadInfoMessageByResource(course,null, null, null, null, 0, 0);
+		String resSubpath = getIdent();
+		List<InfoMessage>  messages = InfoMessageFrontendManager.getInstance().loadInfoMessageByResource(course, resSubpath, null, null, null, 0, 0);
 		InfoMessageFrontendManager infoMessageManager = InfoMessageFrontendManager.getInstance();
 		for (InfoMessage im : messages) {
 			infoMessageManager.deleteInfoMessage(im);