diff --git a/src/helma/util/Logger.java b/src/helma/util/Logger.java
index 28224029..07f3b39b 100644
--- a/src/helma/util/Logger.java
+++ b/src/helma/util/Logger.java
@@ -129,8 +129,11 @@ public class Logger implements Log {
         if ((System.currentTimeMillis() - 1000) > dateLastRendered) {
             renderDate();
         }
-
-        entries.add(dateCache + msg);
+        // add a safety net so we don't grow indefinitely even if writer thread
+        // has gone. the 2000 entries threshold is somewhat arbitrary. 
+        if (entries.size() < 2000) {
+            entries.add(dateCache + msg);
+        }
     }
 
     /**