diff --git a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormController.js b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormController.js
index 535a5d9010e1ff94350907732ed5962d25b36441..8fd8753fb48985933e84b7e7b32d378430af0da9 100644
--- a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormController.js
+++ b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormController.js
@@ -505,7 +505,9 @@ function SampleFormController(mainController, mode, sample, paginationInfo) {
                 var project = parameters["sampleProject"];
                 if (project != null) {
                     object.setProjectId(new ProjectIdentifier("/" + space + "/" + project));
-                    sampleIdentifier += "/" + project;
+                    if(IdentifierUtil.isProjectSamplesEnabled) {
+                        sampleIdentifier += "/" + project;
+                    }
                     var experiment = parameters["sampleExperiment"]
                     if (experiment != null) {
                         object.setExperimentId(new ExperimentIdentifier("/" + space + "/" + project + "/" + experiment));