diff --git a/src/core/Elsa.Core/Persistence/Specifications/WorkflowInstances/BlockingActivityTypeSpecification.cs b/src/core/Elsa.Core/Persistence/Specifications/WorkflowInstances/BlockingActivityTypeSpecification.cs
deleted file mode 100644
index ad9641cc0..000000000
--- a/src/core/Elsa.Core/Persistence/Specifications/WorkflowInstances/BlockingActivityTypeSpecification.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using System.Linq;
-using System.Linq.Expressions;
-using Elsa.Models;
-
-namespace Elsa.Persistence.Specifications.WorkflowInstances
-{
-    public class BlockingActivityTypeSpecification : Specification<WorkflowInstance>
-    {
-        public string ActivityType { get; }
-        public BlockingActivityTypeSpecification(string activityType) => ActivityType = activityType;
-        public override Expression<Func<WorkflowInstance, bool>> ToExpression() => instance => instance.BlockingActivities.Any(x => x.ActivityType == ActivityType);
-    }
-}
\ No newline at end of file
diff --git a/src/persistence/Elsa.Persistence.YesSql/Stores/YesSqlWorkflowInstanceStore.cs b/src/persistence/Elsa.Persistence.YesSql/Stores/YesSqlWorkflowInstanceStore.cs
index 2b25ab829..e59a31414 100644
--- a/src/persistence/Elsa.Persistence.YesSql/Stores/YesSqlWorkflowInstanceStore.cs
+++ b/src/persistence/Elsa.Persistence.YesSql/Stores/YesSqlWorkflowInstanceStore.cs
@@ -33,7 +33,6 @@ namespace Elsa.Persistence.YesSql.Stores
                 EntityIdSpecification<WorkflowInstance> spec => Query<WorkflowInstanceIndex>(session, x => x.InstanceId == spec.Id),
                 WorkflowInstanceIdSpecification spec => Query<WorkflowInstanceIndex>(session, x => x.InstanceId == spec.Id),
                 WorkflowInstanceIdsSpecification spec => Query<WorkflowInstanceIndex>(session, x => x.InstanceId.IsIn(spec.WorkflowInstanceIds)),
-                BlockingActivityTypeSpecification spec => Query<WorkflowInstanceBlockingActivitiesIndex>(session, x => x.ActivityType == spec.ActivityType),
                 _ => AutoMapSpecification<WorkflowInstanceIndex>(session, specification)
             };
 
@@ -41,12 +40,6 @@ namespace Elsa.Persistence.YesSql.Stores
         {
             switch (specification)
             {
-                case BlockingActivityTypeSpecification:
-                {
-                    var indexedQuery = query.With<WorkflowInstanceBlockingActivitiesIndex>();
-                    var expression = orderBy.OrderByExpression.ConvertType<WorkflowInstance, WorkflowInstanceDocument>().ConvertType<WorkflowInstanceDocument, WorkflowInstanceBlockingActivitiesIndex>();
-                    return orderBy.SortDirection == SortDirection.Ascending ? indexedQuery.OrderBy(expression) : indexedQuery.OrderByDescending(expression);
-                }
                 default:
                 {
                     var indexedQuery = query.With<WorkflowInstanceIndex>();