diff --git a/main/resources/META-INF/persistence.xml b/main/resources/META-INF/persistence.xml
index 23d3d04..49b3b59 100644
--- a/main/resources/META-INF/persistence.xml
+++ b/main/resources/META-INF/persistence.xml
@@ -22,6 +22,8 @@
 				value="org.hibernate.transaction.JDBCTransactionFactory" />
 			<property name="hibernate.current_session_context_class"
 				value="thread" />
+			<property name="hibernate.enable_lazy_load_no_trans"
+				value="true" />
 		</properties>
 	</persistence-unit>
 </persistence>
\ No newline at end of file
diff --git a/src/io/github/norbipeti/chat/server/db/DataProvider.java b/src/io/github/norbipeti/chat/server/db/DataProvider.java
index 2ac63b0..5825fa5 100644
--- a/src/io/github/norbipeti/chat/server/db/DataProvider.java
+++ b/src/io/github/norbipeti/chat/server/db/DataProvider.java
@@ -6,6 +6,7 @@ import javax.persistence.EntityManagerFactory;
 import javax.persistence.Persistence;
 import javax.persistence.TypedQuery;
 
+import org.hibernate.Hibernate;
 import org.hibernate.Session;
 
 import io.github.norbipeti.chat.server.db.domain.*;
@@ -51,6 +52,7 @@ public class DataProvider implements AutoCloseable {
 		EntityManager em = emf.createEntityManager();
 		TypedQuery<T> query = em.createQuery("SELECT x FROM " + cl.getSimpleName() + " x", cl);
 		List<T> results = query.getResultList();
+		Hibernate.initialize(results);
 		em.close();
 		return results;
 	}