diff --git a/src/BirdsiteLive.Pipeline/Processors/RetrieveTwitterUsersProcessor.cs b/src/BirdsiteLive.Pipeline/Processors/RetrieveTwitterUsersProcessor.cs
index 7e6ef8e..d08d9cb 100644
--- a/src/BirdsiteLive.Pipeline/Processors/RetrieveTwitterUsersProcessor.cs
+++ b/src/BirdsiteLive.Pipeline/Processors/RetrieveTwitterUsersProcessor.cs
@@ -44,8 +44,9 @@ namespace BirdsiteLive.Pipeline.Processors
                     var maxUsersNumber = await _maxUsersNumberProvider.GetMaxUsersNumberAsync();
                     var users = await _twitterUserDal.GetAllTwitterUsersAsync(maxUsersNumber);
 
-                    var splitNumber = users.Any() ? users.Length : 25;
-                    var splitUsers = users.Split(splitNumber).ToList();
+                    var userCount = users.Any() ? Math.Min(users.Length, 25) : 1;
+                    //var splitNumber = (int) Math.Ceiling(userCount / 15d);
+                    var splitUsers = users.Split(userCount).ToList();
 
                     foreach (var u in splitUsers)
                     {
@@ -54,7 +55,7 @@ namespace BirdsiteLive.Pipeline.Processors
                         await twitterUsersBufferBlock.SendAsync(u.ToArray(), ct);
                     }
 
-                    //await Task.Delay(1000, ct);
+                    await Task.Delay(1000, ct);
                 }
                 catch (Exception e)
                 {
@@ -63,4 +64,4 @@ namespace BirdsiteLive.Pipeline.Processors
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Tests/BirdsiteLive.Pipeline.Tests/Processors/RetrieveTwitterUsersProcessorTests.cs b/src/Tests/BirdsiteLive.Pipeline.Tests/Processors/RetrieveTwitterUsersProcessorTests.cs
index 09c139b..71951f5 100644
--- a/src/Tests/BirdsiteLive.Pipeline.Tests/Processors/RetrieveTwitterUsersProcessorTests.cs
+++ b/src/Tests/BirdsiteLive.Pipeline.Tests/Processors/RetrieveTwitterUsersProcessorTests.cs
@@ -57,7 +57,7 @@ namespace BirdsiteLive.Pipeline.Tests.Processors
             twitterUserDalMock.VerifyAll();
             Assert.IsTrue(0 < buffer.Count);
             buffer.TryReceive(out var result);
-            Assert.IsTrue(1 < result.Length);
+            Assert.IsTrue(0 < result.Length);
             #endregion
         }
 
@@ -268,4 +268,4 @@ namespace BirdsiteLive.Pipeline.Tests.Processors
             throw e;
         }
     }
-}
\ No newline at end of file
+}