diff --git a/server-core/src/main/java/io/onedev/server/data/DefaultDataService.java b/server-core/src/main/java/io/onedev/server/data/DefaultDataService.java
index a1249032ef..4585061a26 100644
--- a/server-core/src/main/java/io/onedev/server/data/DefaultDataService.java
+++ b/server-core/src/main/java/io/onedev/server/data/DefaultDataService.java
@@ -8,6 +8,7 @@ import static io.onedev.server.model.support.administration.SystemSetting.PROP_D
 import static io.onedev.server.model.support.administration.SystemSetting.PROP_GIT_LOCATION;
 import static io.onedev.server.model.support.administration.SystemSetting.PROP_SSH_ROOT_URL;
 import static io.onedev.server.model.support.administration.SystemSetting.PROP_USE_AVATAR_SERVICE;
+import static io.onedev.server.model.support.administration.SystemSetting.PROP_SESSION_TIMEOUT;
 import static io.onedev.server.persistence.PersistenceUtils.tableExists;
 import static org.unbescape.html.HtmlEscape.escapeHtml5;
 
@@ -714,7 +715,7 @@ public class DefaultDataService implements DataService, Serializable {
 		}
 		
 		if (systemSetting != null) {
-			Collection<String> excludedProps = Sets.newHashSet(PROP_SSH_ROOT_URL, PROP_DISABLE_AUTO_UPDATE_CHECK, PROP_USE_AVATAR_SERVICE);
+			Collection<String> excludedProps = Sets.newHashSet(PROP_SSH_ROOT_URL, PROP_DISABLE_AUTO_UPDATE_CHECK, PROP_USE_AVATAR_SERVICE, PROP_SESSION_TIMEOUT);
 			if (Bootstrap.isInDocker()) {
 				excludedProps.add(PROP_GIT_LOCATION);
 				excludedProps.add(PROP_CURL_LOCATION);
diff --git a/server-core/src/main/java/io/onedev/server/jetty/DefaultJettyService.java b/server-core/src/main/java/io/onedev/server/jetty/DefaultJettyService.java
index 0e1a7a1213..0172d58a7d 100644
--- a/server-core/src/main/java/io/onedev/server/jetty/DefaultJettyService.java
+++ b/server-core/src/main/java/io/onedev/server/jetty/DefaultJettyService.java
@@ -88,7 +88,8 @@ public class DefaultJettyService implements JettyService, Provider<ServletContex
         servletContextHandler.getSessionHandler().setSessionIdPathParameterName(null);
         servletContextHandler.getSessionHandler().setSameSite(SameSite.LAX);  
         servletContextHandler.getSessionHandler().setHttpOnly(true);
-		servletContextHandler.getSessionHandler().setMaxInactiveInterval(settingService.getSystemSetting().getSessionTimeout() * 60);
+		if (settingService.getSystemSetting() != null) 
+			servletContextHandler.getSessionHandler().setMaxInactiveInterval(settingService.getSystemSetting().getSessionTimeout() * 60);
 
         /*
          * By default contributions is in reverse dependency order. We reverse the order so that 
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.java
index c58ef1c868..c85f2205ad 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.java
@@ -40,6 +40,8 @@ public class SystemSetting implements Serializable, Validatable {
 	public static final String PROP_CURL_LOCATION = "curlLocation";
 	
 	public static final String PROP_SSH_ROOT_URL = "sshRootUrl";
+
+	public static final String PROP_SESSION_TIMEOUT = "sessionTimeout";
 	
 	public static final String PROP_USE_AVATAR_SERVICE = "useAvatarService";
 	
diff --git a/server-ee b/server-ee
index fc8f4fad4f..28e98b3e7f 160000
--- a/server-ee
+++ b/server-ee
@@ -1 +1 @@
-Subproject commit fc8f4fad4f001fce72b1f6805383e0b0951dd17a
+Subproject commit 28e98b3e7f1b189e3fd64bb5a1f554a51bfba64d