diff --git a/CHANGELOG.md b/CHANGELOG.md
index d89441b0a..fef9c6db2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
 - xfer: fix send of data on the DCC chat buffer after `/upgrade` if the buffer was opened before the upgrade ([#2092](https://github.com/weechat/weechat/issues/2092))
 - php: fix return value of function hdata_longlong
 - tcl: fix return value of function hdata_longlong ([#2119](https://github.com/weechat/weechat/issues/2119))
+- relay: fix allocation and reinit of field "client_context_takeover" in websocket deflate structure
 - core: fix detection of libgcrypt ≥ 1.11 ([debian #1071960](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1071960))
 - core, relay: fix include directory of libcjson and libzstd
 - tests: fix relay tests on s390x ([#2118](https://github.com/weechat/weechat/issues/2118))
diff --git a/src/plugins/relay/relay-websocket.c b/src/plugins/relay/relay-websocket.c
index 15f228afa..429394f7b 100644
--- a/src/plugins/relay/relay-websocket.c
+++ b/src/plugins/relay/relay-websocket.c
@@ -49,7 +49,7 @@ relay_websocket_deflate_alloc ()
 
     new_ws_deflate->enabled = 0;
     new_ws_deflate->server_context_takeover = 0;
-    new_ws_deflate->server_context_takeover = 0;
+    new_ws_deflate->client_context_takeover = 0;
     new_ws_deflate->window_bits_deflate = 0;
     new_ws_deflate->window_bits_inflate = 0;
     new_ws_deflate->strm_deflate = NULL;
@@ -145,7 +145,7 @@ relay_websocket_deflate_reinit (struct t_relay_websocket_deflate *ws_deflate)
 {
     ws_deflate->enabled = 0;
     ws_deflate->server_context_takeover = 0;
-    ws_deflate->server_context_takeover = 0;
+    ws_deflate->client_context_takeover = 0;
     ws_deflate->window_bits_deflate = 0;
     ws_deflate->window_bits_inflate = 0;
     relay_websocket_deflate_free_stream_deflate (ws_deflate);
diff --git a/tests/unit/plugins/relay/test-relay-http.cpp b/tests/unit/plugins/relay/test-relay-http.cpp
index 36536ccb6..f35638e5b 100644
--- a/tests/unit/plugins/relay/test-relay-http.cpp
+++ b/tests/unit/plugins/relay/test-relay-http.cpp
@@ -103,7 +103,7 @@ TEST(RelayHttp, RequestAllocReinitFree)
     CHECK(request->ws_deflate);
     LONGS_EQUAL(0, request->ws_deflate->enabled);
     LONGS_EQUAL(0, request->ws_deflate->server_context_takeover);
-    LONGS_EQUAL(0, request->ws_deflate->server_context_takeover);
+    LONGS_EQUAL(0, request->ws_deflate->client_context_takeover);
     LONGS_EQUAL(0, request->ws_deflate->window_bits_deflate);
     LONGS_EQUAL(0, request->ws_deflate->window_bits_inflate);
     POINTERS_EQUAL(NULL, request->ws_deflate->strm_deflate);
@@ -146,7 +146,7 @@ TEST(RelayHttp, RequestAllocReinitFree)
     CHECK(request->ws_deflate);
     LONGS_EQUAL(0, request->ws_deflate->enabled);
     LONGS_EQUAL(0, request->ws_deflate->server_context_takeover);
-    LONGS_EQUAL(0, request->ws_deflate->server_context_takeover);
+    LONGS_EQUAL(0, request->ws_deflate->client_context_takeover);
     LONGS_EQUAL(0, request->ws_deflate->window_bits_deflate);
     LONGS_EQUAL(0, request->ws_deflate->window_bits_inflate);
     POINTERS_EQUAL(NULL, request->ws_deflate->strm_deflate);
@@ -565,7 +565,7 @@ TEST(RelayHttp, ParseHeader)
     CHECK(request->ws_deflate);
     LONGS_EQUAL(1, request->ws_deflate->enabled);
     LONGS_EQUAL(1, request->ws_deflate->server_context_takeover);
-    LONGS_EQUAL(1, request->ws_deflate->server_context_takeover);
+    LONGS_EQUAL(1, request->ws_deflate->client_context_takeover);
     LONGS_EQUAL(15, request->ws_deflate->window_bits_deflate);
     LONGS_EQUAL(15, request->ws_deflate->window_bits_inflate);
     POINTERS_EQUAL(NULL, request->ws_deflate->strm_deflate);
diff --git a/tests/unit/plugins/relay/test-relay-websocket.cpp b/tests/unit/plugins/relay/test-relay-websocket.cpp
index 38799c059..d54a70ab8 100644
--- a/tests/unit/plugins/relay/test-relay-websocket.cpp
+++ b/tests/unit/plugins/relay/test-relay-websocket.cpp
@@ -62,7 +62,7 @@ TEST(RelayWebsocket, DeflateAllocFree)
     ws_deflate = relay_websocket_deflate_alloc ();
     LONGS_EQUAL(0, ws_deflate->enabled);
     LONGS_EQUAL(0, ws_deflate->server_context_takeover);
-    LONGS_EQUAL(0, ws_deflate->server_context_takeover);
+    LONGS_EQUAL(0, ws_deflate->client_context_takeover);
     LONGS_EQUAL(0, ws_deflate->window_bits_deflate);
     LONGS_EQUAL(0, ws_deflate->window_bits_inflate);
     POINTERS_EQUAL(NULL, ws_deflate->strm_deflate);