diff --git a/common/cpp/src/system_io/system_io.h b/common/cpp/src/system_io/system_io.h
index eba2d6e042e32b0393af61501a909f9d4eeca3f2..b7e561123a1d8d69c367db881a225c330560d189 100644
--- a/common/cpp/src/system_io/system_io.h
+++ b/common/cpp/src/system_io/system_io.h
@@ -29,7 +29,7 @@ class SystemIO final : public IO {
 
 #if defined(__linux__) || defined (__APPLE__)
     // used to for epoll - assumed single epoll instance per class instance
-    static constexpr int kMaxEpollEvents = 10;
+    static constexpr int kMaxEpollEvents = 5; // Was 10 before, changed to decrease timeout
     mutable int epoll_fd_ = -1;
     Error AddToEpool(SocketDescriptor sd) const;
     Error CreateEpoolIfNeeded(SocketDescriptor master_socket) const;