diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/settings/HttpClientSettings.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/settings/HttpClientSettings.java
index db2bac8..7f724f4 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/settings/HttpClientSettings.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/settings/HttpClientSettings.java
@@ -34,30 +34,24 @@ import java.util.TreeMap;
 import java.util.function.Consumer;
 
 
+@Getter
 public class HttpClientSettings {
 
-    @Getter
-    final Map<String, Object> params;
+    private final Map<String, Object> params;
 
-    @Getter
-    final Map<String, String> headers;
+    private final Map<String, String> headers;
 
-    @Getter
-    final Map<String, String> cookies;
-
-    @Getter
-    @Setter
-    ProxyClientSettings proxyClientSettings;
-
-    @Getter
-    Consumer<HttpClient.Builder> onClientCreating;
-
-    @Getter
-    Consumer<HttpRequest.Builder> onRequestCreating;
+    private final Map<String, String> cookies;
 
     @Setter
-    @Getter
-    Duration timeout;
+    private ProxyClientSettings proxyClientSettings;
+
+    private Consumer<HttpClient.Builder> onClientCreating;
+
+    private Consumer<HttpRequest.Builder> onRequestCreating;
+
+    @Setter
+    private Duration timeout;
 
     public HttpClientSettings() {
         this.params = new TreeMap<>();
@@ -65,10 +59,8 @@ public class HttpClientSettings {
         this.cookies = new HashMap<>();
         this.timeout = Duration.ofSeconds(2);
         this.proxyClientSettings = new ProxyClientSettings();
-        this.onClientCreating = (x) -> {
-        };
-        this.onRequestCreating = (x) -> {
-        };
+        this.onClientCreating = (x) -> {};
+        this.onRequestCreating = (x) -> {};
     }
 
     /**
diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/TikTokWebSocketClient.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/TikTokWebSocketClient.java
index bfeffa1..824c689 100644
--- a/Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/TikTokWebSocketClient.java
+++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/TikTokWebSocketClient.java
@@ -33,6 +33,7 @@ import org.java_websocket.client.WebSocketClient;
 import javax.net.ssl.*;
 import java.net.Proxy;
 import java.security.cert.X509Certificate;
+import java.util.HashMap;
 
 public class TikTokWebSocketClient implements SocketClient {
     private final LiveClientSettings clientSettings;
@@ -62,7 +63,7 @@ public class TikTokWebSocketClient implements SocketClient {
 
         messageHandler.handle(liveClient, connectionData.getWebcastResponse());
 
-        var headers = clientSettings.getHttpSettings().getHeaders();
+		var headers = new HashMap<>(clientSettings.getHttpSettings().getHeaders());
         headers.put("Cookie", connectionData.getWebsocketCookies());
         webSocketClient = new TikTokWebSocketListener(connectionData.getWebsocketUrl(),
                 headers,