diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index e9c4c54..77707c6 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -22,7 +22,7 @@
   </context-param>
   <servlet>
     <servlet-name>ncore</servlet-name>
-      <!-- <servlet-class>biz.redsoft.ncore_vaadin.server.NcoreApplicationServlet</servlet-class> -->
+      <servlet-class>biz.redsoft.ncore_vaadin.server.NcoreApplicationServlet</servlet-class>
       <!-- <servlet-class>biz.redsoft.ncore_vaadinflow.server.NcoreApplicationServlet</servlet-class> -->
     <init-param>
       <description>Vaadin application class to start</description>
@@ -51,7 +51,7 @@
     <listener-class>biz.redsoft.ncore.dx.init.DxInitializationListener</listener-class>
   </listener>
   <listener>
-    <!-- <listener-class>biz.redsoft.ncore_vaadin.client.vaadin.VaadinSessionListener</listener-class> -->
+    <listener-class>biz.redsoft.ncore_vaadin.client.vaadin.VaadinSessionListener</listener-class>
     <!-- <listener-class>biz.redsoft.ncore_vaadinflow.client.vaadin.VaadinSessionListener</listener-class> -->
   </listener>
 </web-app>