diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/GenericClientService.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/GenericClientService.java
index 21bc98ebeabd4438ed39c7af05055ceaeecf5c70..e6501d400107a687e869ec41b70ae35cdba65e6a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/GenericClientService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/GenericClientService.java
@@ -234,7 +234,7 @@ public class GenericClientService extends AbstractClientService implements IGene
                                             operationKind, sessionToken);
                             // Execute task
                             genericServer.registerOrUpdateSamples(sessionToken, asyncInfo.getSamples());
-                            if (isCreateContinuousSampleCodes)
+                            if (isAutoGenerateCodes && isCreateContinuousSampleCodes)
                             {
                                 updateTemporaryCodes(sessionToken, asyncInfo);
                             }
@@ -246,7 +246,7 @@ public class GenericClientService extends AbstractClientService implements IGene
             } else
             {
                 genericServer.registerOrUpdateSamples(sessionToken, info.getSamples());
-                if (isCreateContinuousSampleCodes)
+                if (isAutoGenerateCodes && isCreateContinuousSampleCodes)
                 {
                     updateTemporaryCodes(sessionToken, info);
                 }