diff --git a/src/Router/__Libraries/StellaOps.Messaging.Transport.Valkey/Options/ValkeyTransportOptions.cs b/src/Router/__Libraries/StellaOps.Messaging.Transport.Valkey/Options/ValkeyTransportOptions.cs
index 6aa27d7aa..ed96244f5 100644
--- a/src/Router/__Libraries/StellaOps.Messaging.Transport.Valkey/Options/ValkeyTransportOptions.cs
+++ b/src/Router/__Libraries/StellaOps.Messaging.Transport.Valkey/Options/ValkeyTransportOptions.cs
@@ -53,5 +53,5 @@ public class ValkeyTransportOptions
     /// Configurable via compose env var <c>VALKEY_QUEUE_WAIT_TIMEOUT</c>.
     /// </para>
     /// </summary>
-    public int QueueWaitTimeoutSeconds { get; set; } = 5;
+    public int QueueWaitTimeoutSeconds { get; set; } = 10;
 }
diff --git a/src/Router/__Libraries/StellaOps.Messaging.Transport.Valkey/ValkeyMessageQueue.cs b/src/Router/__Libraries/StellaOps.Messaging.Transport.Valkey/ValkeyMessageQueue.cs
index 045eee07a..74e9bfeb6 100644
--- a/src/Router/__Libraries/StellaOps.Messaging.Transport.Valkey/ValkeyMessageQueue.cs
+++ b/src/Router/__Libraries/StellaOps.Messaging.Transport.Valkey/ValkeyMessageQueue.cs
@@ -468,7 +468,7 @@ public sealed class ValkeyMessageQueue<TMessage> : IMessageQueue<TMessage>, INot
         var configuredSeconds = _transportOptions.QueueWaitTimeoutSeconds;
         var effectiveTimeout = configuredSeconds <= 0
             ? Timeout.InfiniteTimeSpan
-            : TimeSpan.FromSeconds(configuredSeconds + Random.Shared.Next(0, configuredSeconds));
+            : TimeSpan.FromSeconds(configuredSeconds + Random.Shared.Next(0, 2 * configuredSeconds));
 
         // Wait for a pub/sub signal or timeout (fallback for missed notifications).
         try