diff --git a/CHANGELOG.md b/CHANGELOG.md
index c342d98f75..d1576c9329 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -52,6 +52,7 @@
 - [#5842](https://github.com/influxdata/influxdb/issues/5842): Add SeriesList binary marshaling
 - [#5854](https://github.com/influxdata/influxdb/issues/5854): failures of tests in tsdb/engine/tsm1 when compiled with go master
 - [#5610](https://github.com/influxdata/influxdb/issues/5610): Write into fully-replicated cluster is not replicated across all shards
+- [#5880](https://github.com/influxdata/influxdb/issues/5880): TCP connection closed after write (regression/change from 0.9.6)
 
 ## v0.10.1 [2016-02-18]
 
diff --git a/services/httpd/handler.go b/services/httpd/handler.go
index 7629cb0665..9d6775812d 100644
--- a/services/httpd/handler.go
+++ b/services/httpd/handler.go
@@ -385,9 +385,9 @@ func (h *Handler) serveWrite(w http.ResponseWriter, r *http.Request, user *meta.
 			resultError(w, influxql.Result{Err: err}, http.StatusBadRequest)
 			return
 		}
+		defer b.Close()
 		body = b
 	}
-	defer body.Close()
 
 	b, err := ioutil.ReadAll(body)
 	if err != nil {