diff --git a/AUTHORS b/AUTHORS
index c120acc12e..6f11ee66d8 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -32,6 +32,7 @@ Silviu Caragea <silviu.cpp@gmail.com>
 Steve Reid <sreid@sea-to-sky.net>
 Vicken Simonian <vsimon@gmail.com>
 Victor Costan <costan@gmail.com>
+Alexander Brauckmann <a.brauckmann@gmail.com>
 
 &yet LLC
 Agora IO
diff --git a/webrtc/modules/audio_device/dummy/file_audio_device.cc b/webrtc/modules/audio_device/dummy/file_audio_device.cc
index 3fff40b0f9..ea432af203 100644
--- a/webrtc/modules/audio_device/dummy/file_audio_device.cc
+++ b/webrtc/modules/audio_device/dummy/file_audio_device.cc
@@ -500,7 +500,12 @@ bool FileAudioDevice::PlayThreadProcess()
     }
     _playoutFramesLeft = 0;
     _critSect.Leave();
-    SleepMs(10 - (_clock->CurrentNtpInMilliseconds() - currentTime));
+
+    uint64_t deltaTimeMillis = _clock->CurrentNtpInMilliseconds() - currentTime;
+    if(deltaTimeMillis < 10) {
+      SleepMs(10 - deltaTimeMillis);
+    }
+
     return true;
 }
 
@@ -530,7 +535,12 @@ bool FileAudioDevice::RecThreadProcess()
     }
 
     _critSect.Leave();
-    SleepMs(10 - (_clock->CurrentNtpInMilliseconds() - currentTime));
+
+    uint64_t deltaTimeMillis = _clock->CurrentNtpInMilliseconds() - currentTime;
+    if(deltaTimeMillis < 10) {
+      SleepMs(10 - deltaTimeMillis);
+    }
+
     return true;
 }