diff --git a/internal/status/status.go b/internal/status/status.go
index 253ac1e6..0b076164 100644
--- a/internal/status/status.go
+++ b/internal/status/status.go
@@ -76,12 +76,10 @@ func GetStatus(w http.ResponseWriter, req *http.Request) {
 			if err != nil {
 				srv.Error = fmt.Sprintf("%v", err)
 				srv.Status = statusOffline
-				respStatus = http.StatusServiceUnavailable
 				failureDetected = true
 			} else if r.StatusCode != http.StatusNotFound {
 				srv.Status = statusNotReady
 				srv.Error = fmt.Sprintf("http status %v", r.StatusCode)
-				respStatus = http.StatusServiceUnavailable
 				failureDetected = true
 			}
 			services["player"] = append(services["player"], srv)
diff --git a/server/server.go b/server/server.go
index a111c5ea..9edfb220 100644
--- a/server/server.go
+++ b/server/server.go
@@ -40,8 +40,10 @@ func NewServer(address string, sdkRouter *sdkrouter.Router) *Server {
 		stopWait: 15 * time.Second,
 		stopChan: make(chan os.Signal),
 		listener: &http.Server{
-			Addr:              address,
-			Handler:           r,
+			Addr:    address,
+			Handler: r,
+			// We need this for long uploads
+			WriteTimeout:      0,
 			IdleTimeout:       0,
 			ReadHeaderTimeout: 10 * time.Second,
 		},