diff --git a/net/server.go b/net/server.go
index 9bd9a0b..468b9b2 100644
--- a/net/server.go
+++ b/net/server.go
@@ -260,7 +260,7 @@ func handleRead(s *Server, conn *server.Conn, stopChan <-chan struct{}, doneChan
 		case <-stopChan:
 			conn.Close()
 			<-readMessageChan
-			break
+			return
 		case <-readMessageChan:
 		}
 
@@ -268,7 +268,7 @@ func handleRead(s *Server, conn *server.Conn, stopChan <-chan struct{}, doneChan
 			if server.IsUnexpectedCloseError(err, server.CloseGoingAway, server.CloseAbnormalClosure) {
 				logging.Logger().Debugf(s.serverMessage(fmt.Sprintf("Read error %v", err)))
 			}
-			break
+			return
 		}
 
 		readChan <- message