diff --git a/src/main/java/com/commafeed/backend/dao/GenericDAO.java b/src/main/java/com/commafeed/backend/dao/GenericDAO.java
index d545b2c3..f747e975 100644
--- a/src/main/java/com/commafeed/backend/dao/GenericDAO.java
+++ b/src/main/java/com/commafeed/backend/dao/GenericDAO.java
@@ -36,8 +36,13 @@ public abstract class GenericDAO<T extends AbstractModel> {
 
 	public void saveOrUpdate(Collection<? extends AbstractModel> models) {
 		Session session = em.unwrap(Session.class);
+		int i = 1;
 		for (AbstractModel model : models) {
 			session.saveOrUpdate(model);
+			if (i % 50 == 0) {
+				session.flush();
+				session.clear();
+			}
 		}
 	}