diff --git a/Alc/null.c b/Alc/null.c
index ffff4224..beabdc21 100644
--- a/Alc/null.c
+++ b/Alc/null.c
@@ -55,9 +55,10 @@ static ALuint NullProc(ALvoid *ptr)
         avail = (ALuint64)(now-start) * Device->Frequency / 1000;
         if(avail < done)
         {
-            AL_PRINT("Timer wrapped\n");
-            aluHandleDisconnect(Device);
-            break;
+            /* Timer wrapped. Add the remainder of the cycle to the available
+             * count and reset the number of samples done */
+            avail += 0xFFFFFFFFu*Device->Frequency/1000 - done;
+            done = 0;
         }
         if(avail-done < Device->UpdateSize)
         {
diff --git a/Alc/wave.c b/Alc/wave.c
index 1f25d7f2..f8921c64 100644
--- a/Alc/wave.c
+++ b/Alc/wave.c
@@ -106,9 +106,10 @@ static ALuint WaveProc(ALvoid *ptr)
         avail = (ALuint64)(now-start) * pDevice->Frequency / 1000;
         if(avail < done)
         {
-            AL_PRINT("Timer wrapped\n");
-            aluHandleDisconnect(pDevice);
-            break;
+            /* Timer wrapped. Add the remainder of the cycle to the available
+             * count and reset the number of samples done */
+            avail += 0xFFFFFFFFu*pDevice->Frequency/1000 - done;
+            done = 0;
         }
         if(avail-done < pDevice->UpdateSize)
         {