diff --git a/src/Persistence/Wolverine.RDBMS/MessageDatabase.Incoming.cs b/src/Persistence/Wolverine.RDBMS/MessageDatabase.Incoming.cs
index 56316b002..8a9bccc6d 100644
--- a/src/Persistence/Wolverine.RDBMS/MessageDatabase.Incoming.cs
+++ b/src/Persistence/Wolverine.RDBMS/MessageDatabase.Incoming.cs
@@ -16,6 +16,9 @@ public abstract partial class MessageDatabase<T>
 
     public Task ReassignIncomingAsync(int ownerId, IReadOnlyList<Envelope> incoming)
     {
+        if (incoming.Count == 0)
+            return Task.CompletedTask;
+
         var builder = ToCommandBuilder();
         foreach (var envelope in incoming)
         {