diff --git a/src/Persistence/MartenTests/concurrency_resilient_sharded_processing.cs b/src/Persistence/MartenTests/concurrency_resilient_sharded_processing.cs
index 93f3e88e6..edcc028be 100644
--- a/src/Persistence/MartenTests/concurrency_resilient_sharded_processing.cs
+++ b/src/Persistence/MartenTests/concurrency_resilient_sharded_processing.cs
@@ -4,12 +4,14 @@
 using JasperFx.Core.Reflection;
 using Marten;
 using MartenTests.AggregateHandlerWorkflow;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Shouldly;
 using Wolverine;
 using Wolverine.Configuration;
 using Wolverine.Marten;
 using Wolverine.Runtime;
+using Wolverine.Runtime.Agents;
 using Wolverine.Runtime.Handlers;
 using Wolverine.Runtime.Partitioning;
 using Wolverine.Tracking;
@@ -74,6 +76,10 @@ public async Task hammer_it_with_lots_of_messages_against_buffered()
                 });
             }).StartAsync();
 
+        // This is because of https://github.com/JasperFx/wolverine/issues/1835
+        var agents = await new ExclusiveListenerFamily(host.GetRuntime()).AllKnownAgentsAsync();
+        agents.Any().ShouldBeFalse();
+            
         // Re-purposing the test a bit. Making sure we're constructing forwarding correctly
         var executor = host.GetRuntime().As<IExecutorFactory>().BuildFor(typeof(LogA), new StubEndpoint("Wrong", new StubTransport()));
         executor.As<Executor>().Handler.ShouldBeOfType<PartitionedMessageReRouter>()
diff --git a/src/Wolverine/Configuration/EndpointCollection.cs b/src/Wolverine/Configuration/EndpointCollection.cs
index ebaaa9a1c..07c9c3b5e 100644
--- a/src/Wolverine/Configuration/EndpointCollection.cs
+++ b/src/Wolverine/Configuration/EndpointCollection.cs
@@ -200,7 +200,7 @@ public IReadOnlyList<Endpoint> ExclusiveListeners()
         }
 
         return allEndpoints
-            .Where(x => x is { IsListener: true, ListenerScope: ListenerScope.Exclusive })
+            .Where(x => x is { IsListener: true, ListenerScope: ListenerScope.Exclusive } and not LocalQueue)
             .ToList();
     }