diff --git a/src/modules/Elsa.Workflows.Management/Activities/WorkflowDefinitionActivity/WorkflowDefinitionActivityProvider.cs b/src/modules/Elsa.Workflows.Management/Activities/WorkflowDefinitionActivity/WorkflowDefinitionActivityProvider.cs
index 1a5962a1a..5f5def069 100644
--- a/src/modules/Elsa.Workflows.Management/Activities/WorkflowDefinitionActivity/WorkflowDefinitionActivityProvider.cs
+++ b/src/modules/Elsa.Workflows.Management/Activities/WorkflowDefinitionActivity/WorkflowDefinitionActivityProvider.cs
@@ -35,7 +35,7 @@ public class WorkflowDefinitionActivityProvider : IActivityProvider
             VersionOptions = VersionOptions.All
         };
         
-        var allDescriptors = new List<ActivityDescriptor>();
+        var allDefinitions = new List<WorkflowDefinition>();
         var currentPage = 0;
         const int pageSize = 100;
 
@@ -43,15 +43,13 @@ public class WorkflowDefinitionActivityProvider : IActivityProvider
         {
             var pageArgs = PageArgs.FromPage(currentPage++, pageSize);
             var pageOfDefinitions = await _store.FindManyAsync(filter, pageArgs, cancellationToken);
-            var descriptors = CreateDescriptors(pageOfDefinitions.Items).ToList();
+            allDefinitions.AddRange(pageOfDefinitions.Items);
             
-            allDescriptors.AddRange(descriptors);
-            
-            if(allDescriptors.Count >= pageOfDefinitions.TotalCount)
+            if(pageSize > pageOfDefinitions.TotalCount)
                 break;
         }
         
-        return allDescriptors;
+        return CreateDescriptors(allDefinitions).ToList();
     }
 
     private IEnumerable<ActivityDescriptor> CreateDescriptors(ICollection<WorkflowDefinition> definitions) =>