diff --git a/navalplanner-webapp/src/main/webapp/WEB-INF/web.xml b/navalplanner-webapp/src/main/webapp/WEB-INF/web.xml
index 137784194..49f952eb7 100644
--- a/navalplanner-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/navalplanner-webapp/src/main/webapp/WEB-INF/web.xml
@@ -134,8 +134,8 @@
     </servlet-mapping>
 
     <session-config>
-        <!-- -1 means session doesn't timeout -->
-        <session-timeout>-1</session-timeout>
+        <!-- The session timeout is an hour -->
+        <session-timeout>60</session-timeout>
     </session-config>
 
     <welcome-file-list>
diff --git a/navalplanner-webapp/src/main/webapp/WEB-INF/zk.xml b/navalplanner-webapp/src/main/webapp/WEB-INF/zk.xml
index e91666da1..1b7a30675 100644
--- a/navalplanner-webapp/src/main/webapp/WEB-INF/zk.xml
+++ b/navalplanner-webapp/src/main/webapp/WEB-INF/zk.xml
@@ -4,8 +4,8 @@
     </log>
 
     <session-config>
-        <!-- -1 value means session should never timeout -->
-        <session-timeout>-1</session-timeout>
+        <!-- 1 hour for timeout-->
+        <session-timeout>3600</session-timeout>
     </session-config>
     <error-page>
         <exception-type>java.lang.Throwable