diff --git a/server/src/main/java/net/psforever/filters/ApplyCooldownToDuplicateLoggingFilter.java b/server/src/main/java/net/psforever/filters/ApplyCooldownToDuplicateLoggingFilter.java
index 733b504b7..e13f324a5 100644
--- a/server/src/main/java/net/psforever/filters/ApplyCooldownToDuplicateLoggingFilter.java
+++ b/server/src/main/java/net/psforever/filters/ApplyCooldownToDuplicateLoggingFilter.java
@@ -43,8 +43,8 @@ public class ApplyCooldownToDuplicateLoggingFilter extends Filter<ILoggingEvent>
     }
 
     public void setCleaning(Long duration) {
+        housecleaningTime = housecleaningTime - cleaning + duration;
         cleaning = duration;
-        housecleaningTime = System.currentTimeMillis() + cleaning;
     }
 
     private void runCleaning() {
@@ -58,6 +58,14 @@ public class ApplyCooldownToDuplicateLoggingFilter extends Filter<ILoggingEvent>
         }
     }
 
+    @Override
+    public void start() {
+        if (this.cooldown != 0L) {
+            messageMap = new ConcurrentHashMap<>(1000);
+            super.start();
+        }
+    }
+
     @Override
     public void stop() {
         messageMap.clear();