diff --git a/src/CMSMicroservice.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterQueryHandler.cs b/src/CMSMicroservice.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterQueryHandler.cs
index 3b13f56..dde2b87 100644
--- a/src/CMSMicroservice.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterQueryHandler.cs
+++ b/src/CMSMicroservice.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterQueryHandler.cs
@@ -25,12 +25,12 @@ public class GetAllUserOrderByFilterQueryHandler : IRequestHandler<GetAllUserOrd
                 .Where(x => request.Filter.Amount == null || x.Amount == request.Filter.Amount)
                 .Where(x => request.Filter.PackageId == null || x.PackageId == request.Filter.PackageId)
                 .Where(x => request.Filter.TransactionId == null || x.TransactionId == request.Filter.TransactionId)
-                .Where(x => request.Filter.PaymentStatus == null || x.PaymentStatus == request.Filter.PaymentStatus)
+                .Where(x => request.Filter.PaymentStatus == null || x.PaymentStatus == request.Filter.PaymentStatus.Value)
                 .Where(x => request.Filter.PaymentDate == null || x.PaymentDate >= request.Filter.PaymentDate)
                 .Where(x => request.Filter.UserId == null || x.UserId == request.Filter.UserId)
                 .Where(x => request.Filter.UserAddressId == null || x.UserAddressId == request.Filter.UserAddressId)
                 .Where(x => request.Filter.PaymentMethod == null || x.PaymentMethod == request.Filter.PaymentMethod)
-                .Where(x => request.Filter.DeliveryStatus == null || x.DeliveryStatus == request.Filter.DeliveryStatus);
+                .Where(x => request.Filter.DeliveryStatus == null || x.DeliveryStatus== request.Filter.DeliveryStatus);
         }
         var meta = await query.GetMetaData(request.PaginationState, cancellationToken);
 
diff --git a/src/CMSMicroservice.WebApi/Common/Mappings/UserOrderProfile.cs b/src/CMSMicroservice.WebApi/Common/Mappings/UserOrderProfile.cs
index 6ab5345..89e2a90 100644
--- a/src/CMSMicroservice.WebApi/Common/Mappings/UserOrderProfile.cs
+++ b/src/CMSMicroservice.WebApi/Common/Mappings/UserOrderProfile.cs
@@ -3,9 +3,10 @@ namespace CMSMicroservice.WebApi.Common.Mappings;
 public class UserOrderProfile : IRegister
 {
     void IRegister.Register(TypeAdapterConfig config)
-    {       
+    {
         config.NewConfig<Protobuf.Protos.UserOrder.GetAllUserOrderByFilterRequest, Application.UserOrderCQ.Queries.GetAllUserOrderByFilter.GetAllUserOrderByFilterQuery>()
-        .IgnoreIf((src, dest) => !src.Filter.HasPaymentStatus, dest => dest.Filter.PaymentStatus)
-        .IgnoreIf((src, dest) => !src.Filter.HasPaymentMethod, dest => dest.Filter.PaymentMethod);
+            .IgnoreIf((src, dest) => src.Filter == null || !src.Filter.HasPaymentStatus, dest => dest.Filter.PaymentStatus)
+            .IgnoreIf((src, dest) => src.Filter == null || !src.Filter.HasPaymentMethod, dest => dest.Filter.PaymentMethod)
+            .IgnoreIf((src, dest) => src.Filter == null || !src.Filter.HasDeliveryStatus, dest => dest.Filter.DeliveryStatus);
     }
 }