diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 555aff52..ffcf1dcf 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Changelog
 All changes to this project will be documented in this file.
 
+## [8.1.8] - 2020-03-02
+
+(websocket server) fix regression with disabling zlib extension on the server side. If a client does not support this extension the server will handle it fine. We still need to figure out how to disable the option.
+
 ## [8.1.7] - 2020-02-26
 
 (websocket) traffic tracker received bytes is message size while it should be wire size
diff --git a/ixwebsocket/IXWebSocketHandshake.cpp b/ixwebsocket/IXWebSocketHandshake.cpp
index 64423179..1d384627 100644
--- a/ixwebsocket/IXWebSocketHandshake.cpp
+++ b/ixwebsocket/IXWebSocketHandshake.cpp
@@ -337,8 +337,7 @@ namespace ix
         WebSocketPerMessageDeflateOptions webSocketPerMessageDeflateOptions(header);
 
         // If the client has requested that extension,
-        // and the server does not prevent it, enable it.
-        if (_enablePerMessageDeflate && webSocketPerMessageDeflateOptions.enabled())
+        if (webSocketPerMessageDeflateOptions.enabled())
         {
             _enablePerMessageDeflate = true;
 
diff --git a/ixwebsocket/IXWebSocketServer.cpp b/ixwebsocket/IXWebSocketServer.cpp
index ede04c30..db646d0b 100644
--- a/ixwebsocket/IXWebSocketServer.cpp
+++ b/ixwebsocket/IXWebSocketServer.cpp
@@ -90,15 +90,6 @@ namespace ix
             webSocket->disablePong();
         }
 
-        if (_enablePerMessageDeflate)
-        {
-            webSocket->enablePerMessageDeflate();
-        }
-        else
-        {
-            webSocket->disablePerMessageDeflate();
-        }
-
         // Add this client to our client set
         {
             std::lock_guard<std::mutex> lock(_clientsMutex);