diff --git a/CHANGELOG.md b/CHANGELOG.md
index 774b7c6547c..b86a923a4ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ### Bugfixes
 - [#2297](https://github.com/influxdb/influxdb/pull/2297): create /var/run during startup. Thanks @neonstalwart.
 - [#2312](https://github.com/influxdb/influxdb/pull/2312): Re-use httpclient for continuous queries
+- [#2318](https://github.com/influxdb/influxdb/pull/2318): Remove pointless use of 'done' channel for collectd.
 
 ## v0.9.0-rc25 [2015-04-15]
 
diff --git a/collectd/collectd.go b/collectd/collectd.go
index cd46dbb8c2d..3b4cde075c0 100644
--- a/collectd/collectd.go
+++ b/collectd/collectd.go
@@ -74,12 +74,12 @@ func ListenAndServe(s *Server, iface string) error {
 	s.conn = conn
 
 	s.wg.Add(1)
-	go s.serve(s.done)
+	go s.serve()
 
 	return nil
 }
 
-func (s *Server) serve(done chan struct{}) {
+func (s *Server) serve() {
 	defer s.wg.Done()
 
 	// From https://collectd.org/wiki/index.php/Binary_protocol