diff --git a/src/main/java/org/olat/modules/reminder/manager/ReminderDAO.java b/src/main/java/org/olat/modules/reminder/manager/ReminderDAO.java
index e21c432694dee92cc00986ef74363256027ed137..3ea165d4f6022fc93b5367c72b0c7a11d20c1af9 100644
--- a/src/main/java/org/olat/modules/reminder/manager/ReminderDAO.java
+++ b/src/main/java/org/olat/modules/reminder/manager/ReminderDAO.java
@@ -117,6 +117,15 @@ public class ReminderDAO {
 		numOfDeletedRows++;
 		return numOfDeletedRows;
 	}
+
+	public int delete(RepositoryEntry entry) {
+		int rowsDeleted = 0;
+		List<Reminder> reminders = getReminders(entry);
+		for(Reminder reminder:reminders) {
+			rowsDeleted += delete(reminder);
+		}
+		return rowsDeleted;
+	}
 	
 	/**
 	 * 
diff --git a/src/main/java/org/olat/repository/manager/RepositoryServiceImpl.java b/src/main/java/org/olat/repository/manager/RepositoryServiceImpl.java
index dc38e93f0a8ba69926389a2fa45bba8b89e95562..a7ae5209b4d4ec0fdb0dc768f50bba211cdc529b 100644
--- a/src/main/java/org/olat/repository/manager/RepositoryServiceImpl.java
+++ b/src/main/java/org/olat/repository/manager/RepositoryServiceImpl.java
@@ -56,6 +56,7 @@ import org.olat.core.util.vfs.VFSLeaf;
 import org.olat.course.assessment.manager.AssessmentModeDAO;
 import org.olat.course.assessment.manager.UserCourseInformationsManager;
 import org.olat.course.certificate.CertificatesManager;
+import org.olat.modules.reminder.manager.ReminderDAO;
 import org.olat.repository.ErrorList;
 import org.olat.repository.RepositoryEntry;
 import org.olat.repository.RepositoryEntryAllowToLeaveOptions;
@@ -119,6 +120,8 @@ public class RepositoryServiceImpl implements RepositoryService {
 	private UserCourseInformationsManager userCourseInformationsManager;
 	@Autowired
 	private AssessmentModeDAO assessmentModeDao;
+	@Autowired
+	private ReminderDAO reminderDao;
 
 	@Autowired
 	private LifeFullIndexer lifeIndexer;
@@ -311,7 +314,8 @@ public class RepositoryServiceImpl implements RepositoryService {
 		catalogManager.resourceableDeleted(entry);
 		// delete assessment modes
 		assessmentModeDao.delete(entry);
-		
+		// delete reminders
+		reminderDao.delete(entry);
 		//delete all policies
 		securityManager.deletePolicies(resource);
 		dbInstance.commit();