diff --git a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/ByteAccumulator.java b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/ByteAccumulator.java
index 50573d802816..6e4ce2f7ef5f 100644
--- a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/ByteAccumulator.java
+++ b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/ByteAccumulator.java
@@ -54,6 +54,11 @@ public int getLength()
         return length;
     }
 
+    int getMaxSize() 
+    {
+        return maxSize;
+    }
+
     ByteBuffer newByteBuffer(int size)
     {
         ByteBuffer buf;
diff --git a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/CompressExtension.java b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/CompressExtension.java
index eca443510d48..5e4d9bf56015 100644
--- a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/CompressExtension.java
+++ b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/CompressExtension.java
@@ -48,9 +48,9 @@ public abstract class CompressExtension extends AbstractExtension
     private static final Logger LOG = Log.getLogger(CompressExtension.class);
     
     /**
-     * thread local accumulator
+     * Accumulator
      */
-    protected ThreadLocal<ByteAccumulator> accumulator = ThreadLocal.withInitial(() -> newByteAccumulator());
+    protected ByteAccumulator accumulator;
 
     /**
      * Never drop tail bytes 0000FFFF, from any frame type
@@ -181,7 +181,11 @@ protected void forwardIncoming(Frame frame, ByteAccumulator accumulator)
     protected ByteAccumulator newByteAccumulator()
     {
         int maxSize = Math.max(getPolicy().getMaxTextMessageSize(), getPolicy().getMaxBinaryMessageSize());
-        return new ByteAccumulator(maxSize);
+        if (accumulator == null || accumulator.getMaxSize() != maxSize)
+        {
+            accumulator = new ByteAccumulator(maxSize);
+        }
+        return accumulator;
     }
 
     protected void decompress(ByteAccumulator accumulator, ByteBuffer buf) throws DataFormatException
diff --git a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/DeflateFrameExtension.java b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/DeflateFrameExtension.java
index da14dffd3701..465204cee297 100644
--- a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/DeflateFrameExtension.java
+++ b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/DeflateFrameExtension.java
@@ -63,7 +63,7 @@ public void incomingFrame(Frame frame)
 
         try
         {
-            ByteAccumulator accumulator = this.accumulator.get();
+            accumulator = newByteAccumulator();
             decompress(accumulator, frame.getPayload());
             decompress(accumulator, TAIL_BYTES_BUF.slice());
             forwardIncoming(frame, accumulator);
diff --git a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/PerMessageDeflateExtension.java b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/PerMessageDeflateExtension.java
index d7620b5421d1..4a34d8783760 100644
--- a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/PerMessageDeflateExtension.java
+++ b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/PerMessageDeflateExtension.java
@@ -78,10 +78,9 @@ public void incomingFrame(Frame frame)
             throw new ProtocolException("Invalid RSV1 set on permessage-deflate CONTINUATION frame");
         }
 
-        ByteAccumulator accumulator = this.accumulator.get();
-
         try
         {
+            accumulator = newByteAccumulator();
             ByteBuffer payload = frame.getPayload();
             decompress(accumulator, payload);
             if (frame.isFin())