diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleListPredicate.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleListPredicate.java
index 56e3abf9347cb7ea2e229580860c9e56ab361a04..142ec02f042c1d75c25091d27774248336e77965 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleListPredicate.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleListPredicate.java
@@ -85,7 +85,7 @@ public class SampleListPredicate extends AbstractSpacePredicate<List<Sample>>
         // - technical id
         // - permanent id
         // - space code
-        // - space identifier
+        // - identifier
         final List<Long> ids = new ArrayList<Long>(samples.size());
         final List<String> permIds = new ArrayList<String>(samples.size());
         for (Sample sample : samples)
@@ -122,9 +122,9 @@ public class SampleListPredicate extends AbstractSpacePredicate<List<Sample>>
         }
         for (Long spaceId : getSampleSpaceIds(ids, permIds))
         {
-            if (spaceId == null || spaceId == 0)
+            if (spaceId == null)
             {
-                continue; // Shared samples will return a spaceId of null (or 0 in EoDSQL).
+                continue; // Shared samples will return a spaceId of null.
             }
             final Status status =
                     evaluate(person, allowedRoles, spaceId);
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/internal/authorization/ScreeningPlateListReadOnlyPredicate.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/internal/authorization/ScreeningPlateListReadOnlyPredicate.java
index e72ee957c54700582fb7b259bd00b772d3bfb100..c15c26108956f3cd01a935ae17c0220509ce1765 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/internal/authorization/ScreeningPlateListReadOnlyPredicate.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/internal/authorization/ScreeningPlateListReadOnlyPredicate.java
@@ -91,9 +91,9 @@ public class ScreeningPlateListReadOnlyPredicate extends
         {
             for (Long spaceId : getSampleSpaceIds(permIds))
             {
-                if (spaceId == null || spaceId == 0)
+                if (spaceId == null)
                 {
-                    continue; // Shared samples will return a spaceId of null (or 0 in EoDSQL).
+                    continue; // Shared samples will return a spaceId of null.
                 }
                 final Status status =
                         evaluate(person, allowedRoles, spaceId);