diff --git a/src/ReC.Application/Endpoints/Commands/ObtainEndpointCommand.cs.cs b/src/ReC.Application/Endpoints/Commands/ObtainEndpointCommand.cs.cs
index 3460f30..23d32e5 100644
--- a/src/ReC.Application/Endpoints/Commands/ObtainEndpointCommand.cs.cs
+++ b/src/ReC.Application/Endpoints/Commands/ObtainEndpointCommand.cs.cs
@@ -1,7 +1,9 @@
-using DigitalData.Core.Abstraction.Application.Repository;
+using AutoMapper;
+using DigitalData.Core.Abstraction.Application.Repository;
 using MediatR;
 using Microsoft.EntityFrameworkCore;
 using ReC.Application.Common.Dto;
+using ReC.Domain.Entities;
 
 namespace ReC.Application.Endpoints.Commands;
 
@@ -10,16 +12,16 @@ public class ObtainEndpointCommand : IRequest<EndpointDto>
     public string Uri { get; init; } = null!;
 }
 
-public class ObtainEndpointCommandHandler(IRepository<EndpointDto> repo) : IRequestHandler<ObtainEndpointCommand, EndpointDto>
+public class ObtainEndpointCommandHandler(IRepository<Endpoint> repo, IMapper mapper) : IRequestHandler<ObtainEndpointCommand, EndpointDto>
 {
     public async Task<EndpointDto> Handle(ObtainEndpointCommand request, CancellationToken cancel)
     {
         var endpoint = await repo.Where(e => e.Uri == request.Uri).FirstOrDefaultAsync(cancel);
 
         if (endpoint is not null)
-            return endpoint;
+            return mapper.Map<EndpointDto>(endpoint);
 
         endpoint = await repo.CreateAsync(request, cancel);
-        return endpoint;
+        return mapper.Map<EndpointDto>(endpoint);
     }
 }
\ No newline at end of file