diff --git a/EnvelopeGenerator.Application/Histories/Queries/CountHistoryQuery.cs b/EnvelopeGenerator.Application/Histories/Queries/CountHistoryQuery.cs
index 795799fc..2f1dae88 100644
--- a/EnvelopeGenerator.Application/Histories/Queries/CountHistoryQuery.cs
+++ b/EnvelopeGenerator.Application/Histories/Queries/CountHistoryQuery.cs
@@ -1,11 +1,7 @@
-using AutoMapper;
-using DigitalData.Core.Abstraction.Application.Repository;
+using DigitalData.Core.Abstraction.Application.Repository;
 using DigitalData.Core.Exceptions;
-using EnvelopeGenerator.Application.Common.Dto.History;
-using EnvelopeGenerator.Domain.Constants;
-using MediatR;
-using System.ComponentModel.DataAnnotations;
 using EnvelopeGenerator.Domain.Entities;
+using MediatR;
 using Microsoft.EntityFrameworkCore;
 
 namespace EnvelopeGenerator.Application.Histories.Queries;
@@ -16,6 +12,27 @@ namespace EnvelopeGenerator.Application.Histories.Queries;
 /// </summary>
 public record CountHistoryQuery : HistoryQueryBase, IRequest<int>;
 
+/// <summary>
+/// 
+/// </summary>
+public static class CountHistoryQueryExtensions
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="queryOptions"></param>
+    /// <param name="cancel"></param>
+    /// <returns></returns>
+    public static async Task<bool> AnyHistoryAsync(this ISender sender, Action<CountHistoryQuery> queryOptions, CancellationToken cancel)
+    {
+        var query = new CountHistoryQuery();
+        queryOptions(query);
+        var count = await sender.Send(query, cancel);
+        return count > 0;
+    }
+}
+
 /// <summary>
 /// 
 /// </summary>
@@ -23,17 +40,13 @@ public class CountHistoryQueryHandler : IRequestHandler<CountHistoryQuery, int>
 {
     private readonly IRepository<History> _repo;
 
-    private readonly IMapper _mapper;
-
     /// <summary>
     /// 
     /// </summary>
     /// <param name="repo"></param>
-    /// <param name="mapper"></param>
-    public CountHistoryQueryHandler(IRepository<History> repo, IMapper mapper)
+    public CountHistoryQueryHandler(IRepository<History> repo)
     {
         _repo = repo;
-        _mapper = mapper;
     }
 
     /// <summary>
diff --git a/EnvelopeGenerator.Application/Histories/Queries/HistoryQueryBase.cs b/EnvelopeGenerator.Application/Histories/Queries/HistoryQueryBase.cs
index 0d831011..1286e465 100644
--- a/EnvelopeGenerator.Application/Histories/Queries/HistoryQueryBase.cs
+++ b/EnvelopeGenerator.Application/Histories/Queries/HistoryQueryBase.cs
@@ -13,10 +13,10 @@ public record HistoryQueryBase
     /// Die eindeutige Kennung des Umschlags.
     /// </summary>
     [Required]
-    public int EnvelopeId { get; init; }
+    public int EnvelopeId { get; set; }
 
     /// <summary>
     /// Der Include des Umschlags, der abgefragt werden soll. Kann optional angegeben werden, um die Ergebnisse zu filtern.
     /// </summary>
-    public EnvelopeStatus? Status { get; init; }
+    public EnvelopeStatus? Status { get; set; }
 }
\ No newline at end of file