diff --git a/api/cluster.go b/api/cluster.go
index <HASH>..<HASH> 100644
--- a/api/cluster.go
+++ b/api/cluster.go
@@ -320,13 +320,8 @@ func (s *Server) peerQuerySpeculative(ctx context.Context, data cluster.Traceabl
 		result[resp.peer.GetName()] = resp
 	}
 
-	select {
-	case err := <-errorChan:
-		return nil, err
-	default: // no error
-	}
-
-	return result, nil
+	err := <-errorChan
+	return result, err
 }
 
 // peerQuerySpeculativeChan takes a request and the path to request it on, then fans it out
diff --git a/api/graphite.go b/api/graphite.go
index <HASH>..<HASH> 100644
--- a/api/graphite.go
+++ b/api/graphite.go
@@ -847,13 +847,8 @@ func (s *Server) clusterFindByTag(ctx context.Context, orgId uint32, expressions
 		}
 	}
 
-	select {
-	case err := <-errorChan:
-		return nil, err
-	default: // no error
-	}
-
-	return allSeries, nil
+	err := <-errorChan
+	return allSeries, err
 }
 
 func (s *Server) graphiteTags(ctx *middleware.Context, request models.GraphiteTags) {
Clean up error check of buffered channel