diff --git a/core/src/main/scala/kafka/consumer/ConsumerFetcherThread.scala b/core/src/main/scala/kafka/consumer/ConsumerFetcherThread.scala
index f8c1b4e..937afcd 100644
--- a/core/src/main/scala/kafka/consumer/ConsumerFetcherThread.scala
+++ b/core/src/main/scala/kafka/consumer/ConsumerFetcherThread.scala
@@ -32,7 +32,7 @@ class ConsumerFetcherThread(name: String,
         extends AbstractFetcherThread(name = name, 
                                       clientId = config.clientId + "-" + name,
                                       sourceBroker = sourceBroker,
-                                      socketTimeout = config.socketTimeoutMs,
+                                      socketTimeout = config.socketTimeoutMs + config.fetchWaitMaxMs,
                                       socketBufferSize = config.socketReceiveBufferBytes,
                                       fetchSize = config.fetchMessageMaxBytes,
                                       fetcherBrokerId = Request.OrdinaryConsumerId,
diff --git a/core/src/main/scala/kafka/server/ReplicaFetcherThread.scala b/core/src/main/scala/kafka/server/ReplicaFetcherThread.scala
index 715845b..5985a68 100644
--- a/core/src/main/scala/kafka/server/ReplicaFetcherThread.scala
+++ b/core/src/main/scala/kafka/server/ReplicaFetcherThread.scala
@@ -29,7 +29,7 @@ class ReplicaFetcherThread(name:String,
   extends AbstractFetcherThread(name = name,
                                 clientId = name,
                                 sourceBroker = sourceBroker,
-                                socketTimeout = brokerConfig.replicaSocketTimeoutMs,
+                                socketTimeout = brokerConfig.replicaSocketTimeoutMs + brokerConfig.replicaFetchWaitMaxMs,
                                 socketBufferSize = brokerConfig.replicaSocketReceiveBufferBytes,
                                 fetchSize = brokerConfig.replicaFetchMaxBytes,
                                 fetcherBrokerId = brokerConfig.brokerId,