diff --git a/10/mysql-tomcat/xwiki/hibernate.cfg.xml b/10/mysql-tomcat/xwiki/hibernate.cfg.xml
index 1c69b3900ffd9c8c68dffc2550ac3d24d07608b5..bd0af6882c67d3c13f5d5bf3244d189d9fd8eaf4 100644
--- a/10/mysql-tomcat/xwiki/hibernate.cfg.xml
+++ b/10/mysql-tomcat/xwiki/hibernate.cfg.xml
@@ -97,6 +97,7 @@
     <mapping resource="activitystream.hbm.xml"/>
     <mapping resource="instance.hbm.xml"/>
     <mapping resource="mailsender.hbm.xml"/>
+    <mapping resource="notification-filter-preferences.hbm.xml"/>
 
   </session-factory>
 </hibernate-configuration>
diff --git a/10/postgres-tomcat/xwiki/hibernate.cfg.xml b/10/postgres-tomcat/xwiki/hibernate.cfg.xml
index 79549e2a74752e4a3807d43cd587347901fa46e4..d7ebe1038a0fe07d1e3462548e03f93fa8c9cb52 100644
--- a/10/postgres-tomcat/xwiki/hibernate.cfg.xml
+++ b/10/postgres-tomcat/xwiki/hibernate.cfg.xml
@@ -99,6 +99,7 @@
     <mapping resource="activitystream.hbm.xml"/>
     <mapping resource="instance.hbm.xml"/>
     <mapping resource="mailsender.hbm.xml"/>
+    <mapping resource="notification-filter-preferences.hbm.xml"/>
 
   </session-factory>
 </hibernate-configuration>
diff --git a/9/mysql-tomcat/xwiki/hibernate.cfg.xml b/9/mysql-tomcat/xwiki/hibernate.cfg.xml
index 1c69b3900ffd9c8c68dffc2550ac3d24d07608b5..3b7ac9d94d44624b652cafc04b11296590dd2d95 100644
--- a/9/mysql-tomcat/xwiki/hibernate.cfg.xml
+++ b/9/mysql-tomcat/xwiki/hibernate.cfg.xml
@@ -97,6 +97,6 @@
     <mapping resource="activitystream.hbm.xml"/>
     <mapping resource="instance.hbm.xml"/>
     <mapping resource="mailsender.hbm.xml"/>
-
+    
   </session-factory>
 </hibernate-configuration>
diff --git a/9/postgres-tomcat/xwiki/hibernate.cfg.xml b/9/postgres-tomcat/xwiki/hibernate.cfg.xml
index 79549e2a74752e4a3807d43cd587347901fa46e4..7f0949ca7a89448ef355d107dccedcf3a60a45f4 100644
--- a/9/postgres-tomcat/xwiki/hibernate.cfg.xml
+++ b/9/postgres-tomcat/xwiki/hibernate.cfg.xml
@@ -99,6 +99,6 @@
     <mapping resource="activitystream.hbm.xml"/>
     <mapping resource="instance.hbm.xml"/>
     <mapping resource="mailsender.hbm.xml"/>
-
+    
   </session-factory>
 </hibernate-configuration>
diff --git a/template/xwiki/hibernate.cfg.xml b/template/xwiki/hibernate.cfg.xml
index 56b0d361974c705005fde857cd86cc6354ee971d..4b7d484da2c68df569780a365e9c6aadcbaed45d 100644
--- a/template/xwiki/hibernate.cfg.xml
+++ b/template/xwiki/hibernate.cfg.xml
@@ -118,8 +118,7 @@
     <mapping resource="feeds.hbm.xml"/>
     <mapping resource="activitystream.hbm.xml"/>
     <mapping resource="instance.hbm.xml"/>
-    <mapping resource="mailsender.hbm.xml"/>'''
-    %>
-
+    <mapping resource="mailsender.hbm.xml"/>''' %>
+    <% if (!xwikiVersion.startsWith('9.')) println '<mapping resource="notification-filter-preferences.hbm.xml"/>' %>
   </session-factory>
 </hibernate-configuration>