diff --git a/internal/sms-gateway/modules/messages/service.go b/internal/sms-gateway/modules/messages/service.go
index c3b406c..eb4b53b 100644
--- a/internal/sms-gateway/modules/messages/service.go
+++ b/internal/sms-gateway/modules/messages/service.go
@@ -315,17 +315,17 @@ func (s *Service) recipientsStateToModel(input []smsgateway.RecipientState, hash
 }
 
 func modelToMessageState(input Message) MessageStateOut {
-	return MessageStateOut{
-		DeviceID:    input.DeviceID,
-		IsHashed:    input.IsHashed,
-		IsEncrypted: input.IsEncrypted,
 
-		states := make(map[string]time.Time)
+	states := make(map[string]time.Time)
 		for _, s := range input.States {
 			if !s.UpdatedAt.IsZero() {
 				states[string(s.State)] = s.UpdatedAt
 			}
 		}
+	return MessageStateOut{
+		DeviceID:    input.DeviceID,
+		IsHashed:    input.IsHashed,
+		IsEncrypted: input.IsEncrypted,
 
 		MessageStateIn: MessageStateIn{
 			ID:         input.ExtID,