diff --git a/webrtc/voice_engine/channel.cc b/webrtc/voice_engine/channel.cc
index 3548f4aef..38897fc0d 100644
--- a/webrtc/voice_engine/channel.cc
+++ b/webrtc/voice_engine/channel.cc
@@ -6522,14 +6522,14 @@ Channel::UpdatePacketDelay(const WebRtc_UWord32 timestamp,
             timeStampDiffMs = 0;
             return -1;
         }
-        if (timeStampDiffMs > 5000)
+        if (timeStampDiffMs > (2 * kVoiceEngineMaxMinPlayoutDelayMs))
         {
             timeStampDiffMs = 0;
         }
 
         if (_averageDelayMs == 0)
         {
-            _averageDelayMs = timeStampDiffMs;
+            _averageDelayMs = timeStampDiffMs * 10;
         }
         else
         {
diff --git a/webrtc/voice_engine/voice_engine_defines.h b/webrtc/voice_engine/voice_engine_defines.h
index 78bda7879..a5f96a2e8 100644
--- a/webrtc/voice_engine/voice_engine_defines.h
+++ b/webrtc/voice_engine/voice_engine_defines.h
@@ -106,7 +106,7 @@ enum { kVoiceEngineMaxIsacMaxPayloadSizeBytesSwb = 600 };
 // Lowest minimum playout delay
 enum { kVoiceEngineMinMinPlayoutDelayMs = 0 };
 // Highest minimum playout delay
-enum { kVoiceEngineMaxMinPlayoutDelayMs = 1000 };
+enum { kVoiceEngineMaxMinPlayoutDelayMs = 10000 };
 
 // Network
 // Min packet-timeout time for received RTP packets