diff --git a/wise-webapp/src/main/java/com/wisemapping/dao/MindmapManagerImpl.java b/wise-webapp/src/main/java/com/wisemapping/dao/MindmapManagerImpl.java
index d3b861d9..c97caaab 100644
--- a/wise-webapp/src/main/java/com/wisemapping/dao/MindmapManagerImpl.java
+++ b/wise-webapp/src/main/java/com/wisemapping/dao/MindmapManagerImpl.java
@@ -55,8 +55,10 @@ public class MindmapManagerImpl
         hibernateCriteria.add(Restrictions.eq("mindmapId",mindmapId));
         hibernateCriteria.addOrder( Order.desc("creationTime"));
         // Mientras no haya paginacion solo los 10 primeros
-        hibernateCriteria.setMaxResults(10);
-        return hibernateCriteria.list();
+        // This line throws errors in some environments, so getting all history and taking firsts 10 records
+        // hibernateCriteria.setMaxResults(10);
+        List list = hibernateCriteria.list();
+        return list.subList(0,(10<list.size()?10:list.size()));
     }
 
     public MindMapHistory getHistory(int historyId)