diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CachedResultSetManager.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CachedResultSetManager.java
index 32c6005cb68989f2e949beb09edc42fe6d3189d1..6189587dc86cb92717f175d5881dfa95e8891d2f 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CachedResultSetManager.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CachedResultSetManager.java
@@ -450,11 +450,7 @@ public final class CachedResultSetManager<K> implements IResultSetManager<K>, Se
             final IResultSetConfig<K, T> resultConfig, final IOriginalDataProvider<T> dataProvider,
             final K dataKey)
     {
-        int limit = resultConfig.getLimit();
-        if (limit == IResultSetConfig.NO_LIMIT)
-        {
-            limit = Integer.MAX_VALUE;
-        }
+        int limit = Integer.MAX_VALUE;
         operationLog.info("Retrieving " + limit + " record for a new key " + dataKey);
         List<T> rows = dataProvider.getOriginalData(limit);
         final List<TableModelColumnHeader> headers = dataProvider.getHeaders();