diff --git a/internal/sms-gateway/services/messages.go b/internal/sms-gateway/services/messages.go
index 635ac41..2a2a785 100644
--- a/internal/sms-gateway/services/messages.go
+++ b/internal/sms-gateway/services/messages.go
@@ -53,7 +53,7 @@ func NewMessagesService(params MessagesServiceParams) *MessagesService {
 	return &MessagesService{
 		Messages: params.Messages,
 		PushSvc:  params.PushSvc,
-		Logger:   params.Logger,
+		Logger:   params.Logger.Named("MessagesService"),
 		idgen:    idgen,
 	}
 }
@@ -206,7 +206,9 @@ func (s *MessagesService) filterTimeouted(messages []models.Message) []models.Me
 				v.Recipients[i].State = models.MessageStateFailed
 				v.Recipients[i].Error = types.AsPointer(ErrorTTLExpired)
 			}
-			s.Messages.UpdateState(&v)
+			if err := s.Messages.UpdateState(&v); err != nil {
+				s.Logger.Error("Can't update message state", zap.Error(err))
+			}
 		}
 	}
 	return result