diff --git a/state.go b/state.go
index f0bcff1..fbbd238 100644
--- a/state.go
+++ b/state.go
@@ -407,6 +407,10 @@ func (s *State) MessageAdd(message *Message) error {
 		return ErrNilState
 	}
 
+	if s.MaxMessageCount == 0 {
+		return nil
+	}
+
 	c, err := s.Channel(message.ChannelID)
 	if err != nil {
 		return err
@@ -437,6 +441,10 @@ func (s *State) MessageRemove(message *Message) error {
 		return ErrNilState
 	}
 
+	if s.MaxMessageCount == 0 {
+		return nil
+	}
+
 	c, err := s.Channel(message.ChannelID)
 	if err != nil {
 		return err