diff --git a/src/Raven.Server/Documents/Sharding/Executors/ShardExecutor.cs b/src/Raven.Server/Documents/Sharding/Executors/ShardExecutor.cs
index a22d8a5007bb..fcdf46deccc2 100644
--- a/src/Raven.Server/Documents/Sharding/Executors/ShardExecutor.cs
+++ b/src/Raven.Server/Documents/Sharding/Executors/ShardExecutor.cs
@@ -132,6 +132,10 @@ private Dictionary<int, Lazy<RequestExecutor>> CreateExecutors()
         public override void Dispose()
         {
             base.Dispose();
+
+            if (_requestExecutors == null)
+                return;
+
             SafelyDisposeExecutors(_requestExecutors.Values);
         }
     }