diff --git a/src/core/util/SynchronizedMap.hpp b/src/core/util/SynchronizedMap.hpp
index 5f6c934a..817e93e3 100644
--- a/src/core/util/SynchronizedMap.hpp
+++ b/src/core/util/SynchronizedMap.hpp
@@ -27,7 +27,8 @@ private:
 #endif
 
 	int nextpick;
-	enum { pick_window_size = 500 };
+	// We need a window at least as wide as the number of clients we serve.
+	enum { pick_window_size = 2000 };
 
 public:
 	SynchronizedMap() : nextpick(0) { }