diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AttachmentDAO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AttachmentDAO.java
index a1531c5939faaf9be3cb4714cf70328a8807d42b..d649c55a751c05facd8938b3ee9c430c0b4412e6 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AttachmentDAO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AttachmentDAO.java
@@ -325,7 +325,7 @@ final class AttachmentDAO extends AbstractGenericEntityDAO<AttachmentPE>implemen
 
         hibernateTemplate.flush();
 
-        scheduleRemoveFromFullTextIndex(owner);
+        scheduleDynamicPropertiesEvaluation(owner);
 
         if (operationLog.isInfoEnabled())
         {
@@ -347,16 +347,4 @@ final class AttachmentDAO extends AbstractGenericEntityDAO<AttachmentPE>implemen
                     .scheduleUpdate(DynamicPropertyEvaluationOperation.evaluate(entity.getClass(), Arrays.asList(entity.getId())));
         }
     }
-
-    protected void scheduleRemoveFromFullTextIndex(final AttachmentHolderPE owner)
-    {
-        // refresh the owner data in the index if the owner is a Sample or an Experiment
-        if (IEntityInformationWithPropertiesHolder.class.isAssignableFrom(owner.getClass()))
-        {
-            IEntityInformationWithPropertiesHolder entity = (IEntityInformationWithPropertiesHolder) owner;
-
-            persistencyResources.getDynamicPropertyEvaluationScheduler()
-                    .scheduleUpdate(DynamicPropertyEvaluationOperation.delete(entity.getClass(), Arrays.asList(entity.getId())));
-        }
-    }
 }