diff --git a/server/server.go b/server/server.go
index 3ff1e2e..bff3a98 100644
--- a/server/server.go
+++ b/server/server.go
@@ -214,7 +214,9 @@ func New(cfg *config.Config) (*Server, error) {
 			}
 		}
 		// Remove connection from the waitgroup when done
-		defer waitgroup.Done()
+		if !cfg.KeepAlive {
+			defer waitgroup.Done()
+		}
 		w.Header().Set("Content-Disposition", "attachment; filename="+
 			app.payload.Filename)
 		http.ServeFile(w, r, app.payload.Path)