diff --git a/peer.go b/peer.go
index cef56ebb..af1b9fda 100644
--- a/peer.go
+++ b/peer.go
@@ -957,9 +957,13 @@ func (p *peer) readMessage() (btcwire.Message, []byte, error) {
 	n, msg, buf, err := btcwire.ReadMessageN(p.conn, p.protocolVersion, p.btcnet)
 	if err != nil {
 		p.bytesReceived += uint64(n)
+		p.server.bytesReceived = atomic.AddUint64(&p.server.bytesReceived,
+			uint64(n))
 		return nil, nil, err
 	}
 	p.bytesReceived += uint64(n)
+	p.server.bytesReceived = atomic.AddUint64(&p.server.bytesReceived,
+		uint64(n))
 
 	// Use closures to log expensive operations so they are only run when
 	// the logging level requires it.
@@ -1026,11 +1030,14 @@ func (p *peer) writeMessage(msg btcwire.Message) {
 	n, err := btcwire.WriteMessageN(p.conn, msg, p.protocolVersion, p.btcnet)
 	if err != nil {
 		p.bytesSent += uint64(n)
+		p.server.bytesSent = atomic.AddUint64(&p.server.bytesSent,
+			uint64(n))
 		p.Disconnect()
 		p.logError("Can't send message: %v", err)
 		return
 	}
 	p.bytesSent += uint64(n)
+	p.server.bytesSent = atomic.AddUint64(&p.server.bytesSent, uint64(n))
 }
 
 // isAllowedByRegression returns whether or not the passed error is allowed by
diff --git a/rpcserver.go b/rpcserver.go
index dd7a2bc7..6dab39d4 100644
--- a/rpcserver.go
+++ b/rpcserver.go
@@ -980,10 +980,10 @@ func handleGetInfo(s *rpcServer, cmd btcjson.Cmd) (interface{}, error) {
 
 // handleGetNetTotals implements the getnettotals command.
 func handleGetNetTotals(s *rpcServer, cmd btcjson.Cmd) (interface{}, error) {
-	netTotals := s.server.NetTotals()
+	totalBytesRecv, totalBytesSent := s.server.NetTotals()
 	reply := &btcjson.GetNetTotalsResult{
-		TotalBytesRecv: netTotals.TotalBytesRecv,
-		TotalBytesSent: netTotals.TotalBytesSent,
+		TotalBytesRecv: totalBytesRecv,
+		TotalBytesSent: totalBytesSent,
 		TimeMillis:     time.Now().UTC().UnixNano() / 1000,
 	}
 	return reply, nil
diff --git a/server.go b/server.go
index 676fa9a0..0ce68fcf 100644
--- a/server.go
+++ b/server.go
@@ -51,9 +51,11 @@ type server struct {
 	nonce         uint64
 	listeners     []net.Listener
 	btcnet        btcwire.BitcoinNet
-	started       int32 // atomic
-	shutdown      int32 // atomic
-	shutdownSched int32 // atomic
+	started       int32  // atomic
+	shutdown      int32  // atomic
+	shutdownSched int32  // atomic
+	bytesReceived uint64 // Total bytes received from all peers since start.
+	bytesSent     uint64 // Total bytes sent by all peers since start.
 	addrManager   *AddrManager
 	rpcServer     *rpcServer
 	blockManager  *blockManager
@@ -300,19 +302,6 @@ type getAddedNodesMsg struct {
 	reply chan []*peer
 }
 
-// NetTotals contains information about the total bytes received and sent across
-// the network.
-type NetTotals struct {
-	TotalBytesRecv uint64
-	TotalBytesSent uint64
-}
-
-// getNetTotals is a message type to be sent across the query channel for
-// retrieving the current total bytes sent and received from all peers.
-type getNetTotals struct {
-	reply chan *NetTotals
-}
-
 // handleQuery is the central handler for all queries and commands from other
 // goroutines related to peer state.
 func (s *server) handleQuery(querymsg interface{}, state *peerState) {
@@ -416,18 +405,6 @@ func (s *server) handleQuery(querymsg interface{}, state *peerState) {
 			peers = append(peers, peer)
 		}
 		msg.reply <- peers
-
-	// Request the total bytes sent and received.
-	case getNetTotals:
-		// Respond with a ....
-		netTotals := NetTotals{}
-		state.forAllPeers(func(p *peer) {
-			if p.Connected() {
-				netTotals.TotalBytesRecv += p.bytesReceived
-				netTotals.TotalBytesSent += p.bytesSent
-			}
-		})
-		msg.reply <- &netTotals
 	}
 }
 
@@ -721,10 +698,10 @@ func (s *server) RemoveAddr(addr string) error {
 
 // NetTotals returns the sum of all bytes received and sent across the network
 // for all peers.
-func (s *server) NetTotals() *NetTotals {
-	reply := make(chan *NetTotals)
-	s.query <- getNetTotals{reply: reply}
-	return <-reply
+func (s *server) NetTotals() (uint64, uint64) {
+	totalBytesReceived := atomic.LoadUint64(&s.bytesReceived)
+	totalBytesSent := atomic.LoadUint64(&s.bytesSent)
+	return totalBytesReceived, totalBytesSent
 }
 
 // Start begins accepting connections from peers.