diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml
index 384089ec8..ce7c44468 100644
--- a/web/WEB-INF/web.xml
+++ b/web/WEB-INF/web.xml
@@ -179,7 +179,7 @@
 	<!-- /////////// -->
 	<!-- Miscellaneous -->
 	<session-config>
-		<session-timeout>60</session-timeout>
+		<session-timeout>-1</session-timeout>
 	</session-config>
 
 	<!-- MIME mapping -->
diff --git a/web/WEB-INF/zk.xml b/web/WEB-INF/zk.xml
index 6800aa1ab..2765c6a59 100644
--- a/web/WEB-INF/zk.xml
+++ b/web/WEB-INF/zk.xml
@@ -31,7 +31,7 @@
     <session-config>
         <device-type>ajax</device-type>
         <timeout-uri></timeout-uri>
-        <session-timeout>1800</session-timeout>
+        <session-timeout>-1</session-timeout>
         <timeout-uri>/timeout.zul</timeout-uri>
     </session-config>
     <!--error-page>