diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/history/HibernateHistoryDAO.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/history/HibernateHistoryDAO.java
index 58af8cea2..ed31cfaa9 100644
--- a/logicaldoc-core/src/main/java/com/logicaldoc/core/history/HibernateHistoryDAO.java
+++ b/logicaldoc-core/src/main/java/com/logicaldoc/core/history/HibernateHistoryDAO.java
@@ -11,7 +11,6 @@
 
 import com.logicaldoc.core.HibernatePersistentObjectDAO;
 import com.logicaldoc.core.PersistenceException;
-import com.logicaldoc.core.PersistentObject;
 import com.logicaldoc.core.PersistentObjectDAO;
 import com.logicaldoc.core.RunLevel;
 import com.logicaldoc.core.communication.EventCollector;
diff --git a/logicaldoc-webapp/src/main/java/com/logicaldoc/web/service/SettingServiceImpl.java b/logicaldoc-webapp/src/main/java/com/logicaldoc/web/service/SettingServiceImpl.java
index 3426ef567..bb4ec9851 100644
--- a/logicaldoc-webapp/src/main/java/com/logicaldoc/web/service/SettingServiceImpl.java
+++ b/logicaldoc-webapp/src/main/java/com/logicaldoc/web/service/SettingServiceImpl.java
@@ -203,8 +203,7 @@ public List<GUIParameter> loadSettings() throws ServerException {
 					|| name.startsWith("cas.") || name.startsWith("cache.") || name.startsWith("jdbc.")
 					|| name.startsWith("comparator.") || name.contains(".via.") || name.contains(".downloadticket.")
 					|| name.startsWith("zonalocr.") || name.endsWith(CHARSET) || name.startsWith("policy.")
-					|| name.startsWith("cookies.") || name.startsWith("saml.") || name.startsWith("history.")
-					|| name.endsWith("history.events"))
+					|| name.startsWith("cookies.") || name.startsWith("saml.") || name.startsWith("history."))
 				continue;
 
 			sortedSet.add(key.toString());