diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/SampleCreation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/SampleCreation.java
index 6710ffe9a35d28b803b913b9ce63fe9cf0e4d218..6f97aa030dbfc4d0a205c85482508ff5eec49156 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/SampleCreation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/SampleCreation.java
@@ -60,8 +60,6 @@ public class SampleCreation implements ICreation, ICreationIdHolder, IProperties
 
     private boolean autoGeneratedCode;
 
-    private boolean codeBeatsAutoGeneratedCode;
-
     private List<? extends ITagId> tagIds;
 
     private Map<String, String> properties = new HashMap<String, String>();
@@ -141,16 +139,6 @@ public class SampleCreation implements ICreation, ICreationIdHolder, IProperties
         this.autoGeneratedCode = autoGeneratedCode;
     }
 
-    public boolean isCodeBeatsAutoGeneratedCode()
-    {
-        return codeBeatsAutoGeneratedCode;
-    }
-
-    public void setCodeBeatsAutoGeneratedCode(boolean codeBeatsAutoGeneratedCode)
-    {
-        this.codeBeatsAutoGeneratedCode = codeBeatsAutoGeneratedCode;
-    }
-
     public List<? extends ITagId> getTagIds()
     {
         return tagIds;
diff --git a/api-openbis-javascript/src/v3/as/dto/sample/create/SampleCreation.js b/api-openbis-javascript/src/v3/as/dto/sample/create/SampleCreation.js
index daeb9d993a6f35b3159b6f02f1baaa1f056dc3c4..61e717b3f8ecc226262cbc8ccbe9befcbb11f9cb 100644
--- a/api-openbis-javascript/src/v3/as/dto/sample/create/SampleCreation.js
+++ b/api-openbis-javascript/src/v3/as/dto/sample/create/SampleCreation.js
@@ -24,7 +24,6 @@ define([ "stjs", "as/dto/common/Relationship" ], function(stjs, Relationship) {
 		prototype.attachments = null;
 		prototype.creationId = null;
 		prototype.autoGeneratedCode = null;
-        prototype.codeBeatsAutoGeneratedCode = null;
 		prototype.getTypeId = function() {
 			return this.typeId;
 		};
@@ -61,12 +60,6 @@ define([ "stjs", "as/dto/common/Relationship" ], function(stjs, Relationship) {
 		prototype.setAutoGeneratedCode = function(autoGeneratedCode) {
 			this.autoGeneratedCode = autoGeneratedCode;
 		};
-        prototype.isCodeBeatsAutoGeneratedCode = function() {
-            return this.codeBeatsAutoGeneratedCode;
-        }
-        prototype.setCodeBeatsAutoGeneratedCode = function(codeBeatsAutoGeneratedCode) {
-            this.codeBeatsAutoGeneratedCode = codeBeatsAutoGeneratedCode;
-        };
 		prototype.getTagIds = function() {
 			return this.tagIds;
 		};
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/CreateSampleExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/CreateSampleExecutor.java
index 73b1f7f94f8383fc9d8ab486e16ee8dd64d8f1ab..00c15b29cf379adf7b2b5f2ab45e9a4d56c5b413 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/CreateSampleExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/CreateSampleExecutor.java
@@ -191,11 +191,6 @@ public class CreateSampleExecutor extends AbstractCreateEntityExecutor<SampleCre
                     } else if (type == null)
                     {
                         throw new ObjectNotFoundException(creation.getTypeId());
-                    } else if (false == StringUtils.isEmpty(creation.getCode()) 
-                            && (type.isAutoGeneratedCode() || creation.isAutoGeneratedCode())
-                            && creation.isCodeBeatsAutoGeneratedCode() == false)
-                    {
-                        throw new UserFailureException("Code should be empty when auto generated code is selected.");
                     } else if (StringUtils.isEmpty(creation.getCode()) && false == type.isAutoGeneratedCode()
                             && false == creation.isAutoGeneratedCode())
                     {
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateSampleTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateSampleTest.java
index bd9981986ce5c2bb9f871dfe9d6ebd9903379798..98fc64eb0d812b91ea2d800d4c904328e45f3536 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateSampleTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateSampleTest.java
@@ -164,24 +164,6 @@ public class CreateSampleTest extends AbstractSampleTest
         }, "Code cannot be empty for a non auto generated code", patternContains("checking data (1/1)"));
     }
 
-    @Test
-    public void testCreateWithAutogeneratedCodeNotNull()
-    {
-        final String sessionToken = v3api.login(TEST_USER, PASSWORD);
-        final SampleCreation sample = sampleCreation("SAMPLE_WITH_USER_GIVEN_CODE");
-        sample.setAutoGeneratedCode(true);
-
-        assertUserFailureException(new IDelegatedAction()
-                                   {
-                                       @Override
-                                       public void execute()
-                                       {
-                                           v3api.createSamples(sessionToken, Arrays.asList(sample));
-                                       }
-                                   }, "Code should be empty when auto generated code is selected",
-                patternContains("checking data (1/1)", toDblQuotes("'code' : 'SAMPLE_WITH_USER_GIVEN_CODE'")));
-    }
-
     @Test
     public void testCreateWithAutogeneratedCodeNull()
     {