diff --git a/OpenSim/Region/ClientStack/LindenUDP/TokenBucket.cs b/OpenSim/Region/ClientStack/LindenUDP/TokenBucket.cs
index de8b521b67..0a8331f32a 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/TokenBucket.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/TokenBucket.cs
@@ -207,14 +207,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
                 int dripAmount = deltaMS * tokensPerMS;
 
-                if (dripAmount < 0)
-                    Console.WriteLine("MAY DAY MAY DAY! Drip amount is " + dripAmount + ". This should not happen");
-
                 content = Math.Min(content + dripAmount, maxBurst);
                 lastDrip = now;
 
-                if (content < 0)
-                    Console.WriteLine("MAY DAY MAY DAY! Content is " + content + ". This should not happen");
+                if (dripAmount < 0 || content < 0)
+                    // sim has been idle for too long, integer has overflown
+                    // previous calculation is meaningless, let's put it at correct max
+                    content = maxBurst;
 
                 return true;
             }