diff --git a/src/NServiceBus.Core/Persistence/Raven/TimeoutPersister/RavenTimeoutPersistence.cs b/src/NServiceBus.Core/Persistence/Raven/TimeoutPersister/RavenTimeoutPersistence.cs
index ed720e3b517..6d80de6dad2 100644
--- a/src/NServiceBus.Core/Persistence/Raven/TimeoutPersister/RavenTimeoutPersistence.cs
+++ b/src/NServiceBus.Core/Persistence/Raven/TimeoutPersister/RavenTimeoutPersistence.cs
@@ -32,6 +32,7 @@ private static IRavenQueryable<TimeoutData> GetChunkQuery(IDocumentSession sessi
                 .OrderBy(t => t.Time)
                 .Where(
                     t =>
+					    t.OwningTimeoutManager == null ||
                         t.OwningTimeoutManager == String.Empty ||
                         t.OwningTimeoutManager == Configure.EndpointName);
         }