diff --git a/pkg/plug/grpc.go b/pkg/plug/grpc.go
index 9dc64f6..36b7b7b 100644
--- a/pkg/plug/grpc.go
+++ b/pkg/plug/grpc.go
@@ -160,8 +160,14 @@ func (s *server) GetUserMessages(ctx context.Context, message *gRPC.GetMessagesR
 	ctx, span := tracer.Start(ctx, "GetUserMessages")
 	defer span.End()
 
-	sourceID := models.UserSourceID(message.UserSourceId)
-	userSource := models.UserSource{BaseModel: models.BaseModel[models.UserSourceID]{ID: sourceID}}
+	userSourceID := models.UserSourceID(message.UserSourceId)
+
+	userSource, err := database.GetUserSourceByID(ctx, userSourceID)
+	if err != nil {
+		span.RecordError(err)
+		span.SetStatus(codes.Error, err.Error())
+		return nil, err
+	}
 
 	messages, err := s.getMessageExecution(ctx, userSource)
 	if err != nil {
@@ -180,6 +186,12 @@ func (s *server) GetUserMessages(ctx context.Context, message *gRPC.GetMessagesR
 		})
 	}
 
+	span.SetAttributes(
+		attribute.String("user_source_id", string(userSource.ID)),
+		attribute.String("user_id", string(userSource.UserID)),
+		attribute.String("source_id", string(userSource.SourceID)),
+	)
+
 	return &response, err
 
 }