diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/EntityTypePropertyTypeBO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/EntityTypePropertyTypeBO.java
index 1d818e5238ba398269e2045d959d4f67a216ee85..236d79a9adbf695e86761137d92975a0917c991e 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/EntityTypePropertyTypeBO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/EntityTypePropertyTypeBO.java
@@ -159,7 +159,7 @@ public class EntityTypePropertyTypeBO extends AbstractBusinessObject implements
                             defaultValue);
             for (int i = 0; i < entities.size(); i++)
             {
-                if (i % 1000 == 0)
+                if (i > 0 && i % 1000 == 0)
                 {
                     if (operationLog.isDebugEnabled())
                     {
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/EntityTypePropertyTypeBOTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/EntityTypePropertyTypeBOTest.java
index 07d0e98283bee12704efa0b91b1cbc4767c3cf3f..9b9aa8f255b4cf221178cc37260253593eb77585 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/EntityTypePropertyTypeBOTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/EntityTypePropertyTypeBOTest.java
@@ -118,6 +118,9 @@ public final class EntityTypePropertyTypeBOTest extends AbstractBOTest
         context.checking(new Expectations()
             {
                 {
+                    one(daoFactory).setBatchUpdateMode(true);
+                    one(daoFactory).setBatchUpdateMode(false);
+                    
                     one(entityPropertyTypeDAO).tryFindAssignment(experimentType, propertyType);
                     will(returnValue(null));