diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/search/SpaceSearchCriteriaTranslator.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/search/SpaceSearchCriteriaTranslator.java
index 84a51bc2b8f8ccbb7de13d695cf91a4d528c4b2e..79269b628b021fce0b54425f5c1b10a4f96d8466 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/search/SpaceSearchCriteriaTranslator.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/search/SpaceSearchCriteriaTranslator.java
@@ -41,7 +41,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.hibernate.SearchFieldConstant
 public class SpaceSearchCriteriaTranslator extends AbstractFieldFromCompositeSearchCriteriaTranslator
 {
     private static final DetailedSearchField SPACE_ID_FIELD = DetailedSearchField.createAttributeField(
-            new SimpleAttributeSearchFieldKind(SearchFieldConstants.SPACE_ID, "Space ID"));
+            new SimpleAttributeSearchFieldKind(SearchFieldConstants.SAMPLE_SPACE_ID, "Space ID"));
 
     private static final EnumSet<SearchObjectKind> ENTITY_KINDS_WITH_SPACE = EnumSet.of(SearchObjectKind.EXPERIMENT, SearchObjectKind.SAMPLE);
 
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SamplePE.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SamplePE.java
index 8101685de9d03c57cda709ef11d649e628f352da..a7c0454068cc185085ed62edda27733c60f38b81 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SamplePE.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SamplePE.java
@@ -563,7 +563,7 @@ public class SamplePE extends AttachmentHolderPE implements IIdAndCodeHolder, Co
     // used only by Hibernate Search
     @SuppressWarnings("unused")
     @Transient
-    @Field(index = Index.YES, store = Store.YES, name = SearchFieldConstants.SPACE_ID)
+    @Field(index = Index.YES, store = Store.YES, name = SearchFieldConstants.SAMPLE_SPACE_ID)
     @FieldBridge(impl = NullBridge.class)
     private Long getSpaceId()
     {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/hibernate/SearchFieldConstants.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/hibernate/SearchFieldConstants.java
index 7f567a5f3f8f2f857e0e59d97b7cf5e9227d9273..ff87fd0037798efe52073c2face2785b4ac40358 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/hibernate/SearchFieldConstants.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/hibernate/SearchFieldConstants.java
@@ -80,6 +80,8 @@ public final class SearchFieldConstants
     public static final String CONTAINER_ID = PREFIX_CONTAINER + ID;
 
     public static final String SPACE_ID = PREFIX_SPACE + ID;
+    
+    public static final String SAMPLE_SPACE_ID = PREFIX_SAMPLE + PREFIX_SPACE + ID;
 
     public static final String DELETED = "deleted";