diff --git a/ixwebsocket/IXHttpClient.cpp b/ixwebsocket/IXHttpClient.cpp
index 871be336..eca88fa7 100644
--- a/ixwebsocket/IXHttpClient.cpp
+++ b/ixwebsocket/IXHttpClient.cpp
@@ -204,16 +204,17 @@ namespace ix
         }
 
         // Set a default User agent if none is present
-        if (args->extraHeaders.find("User-Agent") == args->extraHeaders.end())
+        /*if (args->extraHeaders.find("User-Agent") == args->extraHeaders.end())
         {
             ss << "User-Agent: " << userAgent() << "\r\n";
-        }
+        }*/
 
-        // Set an origin header if missing
-        if (args->extraHeaders.find("Origin") == args->extraHeaders.end())
+        // Set an 
+        //  header if missing
+        /*if (args->extraHeaders.find("Origin") == args->extraHeaders.end())
         {
             ss << "Origin: " << protocol << "://" << host << ":" << port << "\r\n";
-        }
+        }*/
 
         if (verb == kPost || verb == kPut || verb == kPatch || _forceBody)
         {
diff --git a/ixwebsocket/IXWebSocketHandshake.cpp b/ixwebsocket/IXWebSocketHandshake.cpp
index 206b0790..e2905320 100644
--- a/ixwebsocket/IXWebSocketHandshake.cpp
+++ b/ixwebsocket/IXWebSocketHandshake.cpp
@@ -121,16 +121,16 @@ namespace ix
         ss << "Sec-WebSocket-Key: " << secWebSocketKey << "\r\n";
 
         // User-Agent can be customized by users
-        if (extraHeaders.find("User-Agent") == extraHeaders.end())
-        {
-            ss << "User-Agent: " << userAgent() << "\r\n";
-        }
-
-        // Set an origin header if missing
-        if (extraHeaders.find("Origin") == extraHeaders.end())
-        {
-            ss << "Origin: " << protocol << "://" << host << ":" << port << "\r\n";
-        }
+        //if (extraHeaders.find("User-Agent") == extraHeaders.end())
+        //{
+        //    ss << "User-Agent: " << userAgent() << "\r\n";
+        //}
+
+        //// Set an origin header if missing
+        //if (extraHeaders.find("Origin") == extraHeaders.end())
+        //{
+        //    ss << "Origin: " << protocol << "://" << host << ":" << port << "\r\n";
+        //}
 
         for (auto& it : extraHeaders)
         {