diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 61de039c0..2cbe17c51 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -936,9 +936,10 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 	/**
 	 * Delete all entries for this document from the access control list
 	 *
+	 * @param boolean $noclean set to true if notifier list shall not be clean up
 	 * @return boolean true if operation was successful otherwise false
 	 */
-	function clearAccessList() { /* {{{ */
+	function clearAccessList($noclean=false) { /* {{{ */
 		$db = $this->_dms->getDB();
 
 		$queryStr = "DELETE FROM tblACLs WHERE targetType = " . T_DOCUMENT . " AND target = " . $this->_id;
@@ -946,6 +947,10 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 			return false;
 
 		unset($this->_accessList);
+
+		if(!$noclean)
+			self::cleanNotifyList();
+
 		return true;
 	} /* }}} */
 
diff --git a/SeedDMS_Core/Core/inc.ClassFolder.php b/SeedDMS_Core/Core/inc.ClassFolder.php
index 70651ca96..6ce59d007 100644
--- a/SeedDMS_Core/Core/inc.ClassFolder.php
+++ b/SeedDMS_Core/Core/inc.ClassFolder.php
@@ -955,9 +955,10 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 	/**
 	 * Delete all entries for this folder from the access control list
 	 *
+	 * @param boolean $noclean set to true if notifier list shall not be clean up
 	 * @return boolean true if operation was successful otherwise false
 	 */
-	function clearAccessList() { /* {{{ */
+	function clearAccessList($noclean=false) { /* {{{ */
 		$db = $this->_dms->getDB();
 
 		$queryStr = "DELETE FROM tblACLs WHERE targetType = " . T_FOLDER . " AND target = " . $this->_id;
@@ -965,6 +966,10 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 			return false;
 
 		unset($this->_accessList);
+
+		if(!$noclean)
+			self::cleanNotifyList();
+
 		return true;
 	} /* }}} */