diff --git a/wise-webapp/src/main/java/com/wisemapping/model/Mindmap.java b/wise-webapp/src/main/java/com/wisemapping/model/Mindmap.java
index 64253a33..5c273b83 100644
--- a/wise-webapp/src/main/java/com/wisemapping/model/Mindmap.java
+++ b/wise-webapp/src/main/java/com/wisemapping/model/Mindmap.java
@@ -65,7 +65,7 @@ public class Mindmap implements Serializable {
     @Column(name = "public")
     private boolean isPublic;
 
-    @OneToMany(mappedBy = "mindMap", orphanRemoval = true, cascade = {CascadeType.ALL}, fetch = FetchType.EAGER)
+    @OneToMany(mappedBy = "mindMap", orphanRemoval = true, cascade = {CascadeType.ALL}, fetch = FetchType.LAZY)
     @Fetch(FetchMode.JOIN)
     private Set<Collaboration> collaborations = new HashSet<>();
 
diff --git a/wise-webapp/src/main/resources/spring/wisemapping-dao.xml b/wise-webapp/src/main/resources/spring/wisemapping-dao.xml
index ba55daa0..37ca4676 100644
--- a/wise-webapp/src/main/resources/spring/wisemapping-dao.xml
+++ b/wise-webapp/src/main/resources/spring/wisemapping-dao.xml
@@ -26,6 +26,8 @@
                 <prop key="hibernate.default_batch_fetch_size">200</prop>
                 <prop key="hibernate.nestedTransactionAllowed">true</prop>
                 <prop key="hibernate.auto_quote_keyword">true</prop>
+                <prop key="hibernate.enable_lazy_load_no_trans">true</prop>
+
             </props>
         </property>
     </bean>