diff --git a/CHANGELOG.md b/CHANGELOG.md
index 84f6a1f710..75fc29cbf6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@
 - [#2272](https://github.com/influxdb/influxdb/pull/2272): clustering: influxdb 0.9.0-rc23 panics when doing a GET with merge_metrics in a
 - [#2350](https://github.com/influxdb/influxdb/pull/2350): Issue fix for :influxd -hostname localhost.
 - [#2367](https://github.com/influxdb/influxdb/pull/2367): PR for issue #2350 - Always use localhost, not host name.
+- [#2371](https://github.com/influxdb/influxdb/pull/2371): Don't set client to nil when closing broker Fixes #2352
 
 ## v0.9.0-rc25 [2015-04-15]
 
diff --git a/broker.go b/broker.go
index 1f5296cccb..bef6d86275 100644
--- a/broker.go
+++ b/broker.go
@@ -73,12 +73,9 @@ func (b *Broker) Close() error {
 		b.done = nil
 	}
 
-	if b.client != nil {
-		// since the client doesn't specify a Transport when created,
-		// it will use the DefaultTransport.
-		http.DefaultTransport.(*http.Transport).CloseIdleConnections()
-		b.client = nil
-	}
+	// since the client doesn't specify a Transport when created,
+	// it will use the DefaultTransport.
+	http.DefaultTransport.(*http.Transport).CloseIdleConnections()
 
 	return b.Broker.Close()
 }