diff --git a/src/ReC.Application/Endpoints/Commands/DeleteEndpointProcedure.cs b/src/ReC.Application/Endpoints/Commands/DeleteEndpointProcedure.cs
index 4de2095..e5213c3 100644
--- a/src/ReC.Application/Endpoints/Commands/DeleteEndpointProcedure.cs
+++ b/src/ReC.Application/Endpoints/Commands/DeleteEndpointProcedure.cs
@@ -1,3 +1,4 @@
+using MediatR;
 using ReC.Application.Common.Procedures.DeleteProcedure;
 
 namespace ReC.Application.Endpoints.Commands;
@@ -18,15 +19,18 @@ public record DeleteEndpointProcedure : IDeleteProcedure
     /// If true, delete even if dependent ACTION data exists
     /// </summary>
     public bool Force { get; set; }
+}
 
-    public DeleteObjectProcedure ToObjectProcedure()
+public class DeleteEndpointProcedureHandler(ISender sender) : IRequestHandler<DeleteEndpointProcedure, int>
+{
+    public async Task<int> Handle(DeleteEndpointProcedure request, CancellationToken cancel)
     {
-        return new DeleteObjectProcedure
+        return await sender.Send(new DeleteObjectProcedure
         {
             Entity = "ENDPOINT",
-            Start = Start,
-            End = End,
-            Force = Force
-        };
+            Start = request.Start,
+            End = request.End,
+            Force = request.Force
+        }, cancel);
     }
 }