diff --git a/server.conf.in b/server.conf.in
index 43289b1..6b61b7b 100644
--- a/server.conf.in
+++ b/server.conf.in
@@ -7,7 +7,7 @@
 #readtimeout = 15
 
 # HTTP socket write timeout in seconds.
-#writetimeout = 15
+#writetimeout = 30
 
 [https]
 # IP and port to listen on for HTTPS requests.
@@ -18,7 +18,7 @@
 #readtimeout = 15
 
 # HTTPS socket write timeout in seconds.
-#writetimeout = 15
+#writetimeout = 30
 
 # Certificate / private key to use for the HTTPS server.
 certificate = /etc/nginx/ssl/server.crt
diff --git a/server/main.go b/server/main.go
index a31a0f5..2a5dc60 100644
--- a/server/main.go
+++ b/server/main.go
@@ -61,7 +61,7 @@ var (
 
 const (
 	defaultReadTimeout  = 15
-	defaultWriteTimeout = 15
+	defaultWriteTimeout = 30
 
 	initialMcuRetry = time.Second
 	maxMcuRetry     = time.Second * 16