diff --git a/include/ccapi_cpp/service/ccapi_execution_management_service_bitget_base.h b/include/ccapi_cpp/service/ccapi_execution_management_service_bitget_base.h
index c72d63e3..8715e899 100644
--- a/include/ccapi_cpp/service/ccapi_execution_management_service_bitget_base.h
+++ b/include/ccapi_cpp/service/ccapi_execution_management_service_bitget_base.h
@@ -8,7 +8,9 @@ class ExecutionManagementServiceBitgetBase : public ExecutionManagementService {
  public:
   ExecutionManagementServiceBitgetBase(std::function<void(Event&, Queue<Event>*)> eventHandler, SessionOptions sessionOptions, SessionConfigs sessionConfigs,
                                        ServiceContextPtr serviceContextPtr)
-      : ExecutionManagementService(eventHandler, sessionOptions, sessionConfigs, serviceContextPtr) {}
+      : ExecutionManagementService(eventHandler, sessionOptions, sessionConfigs, serviceContextPtr) {
+    this->hostHttpHeaderValueIgnorePort = true;
+  }
   virtual ~ExecutionManagementServiceBitgetBase() {}
 #ifndef CCAPI_EXPOSE_INTERNAL
 
diff --git a/include/ccapi_cpp/service/ccapi_market_data_service_bitget_base.h b/include/ccapi_cpp/service/ccapi_market_data_service_bitget_base.h
index 9947a282..0f550512 100644
--- a/include/ccapi_cpp/service/ccapi_market_data_service_bitget_base.h
+++ b/include/ccapi_cpp/service/ccapi_market_data_service_bitget_base.h
@@ -8,7 +8,9 @@ class MarketDataServiceBitgetBase : public MarketDataService {
  public:
   MarketDataServiceBitgetBase(std::function<void(Event&, Queue<Event>*)> eventHandler, SessionOptions sessionOptions, SessionConfigs sessionConfigs,
                               std::shared_ptr<ServiceContext> serviceContextPtr)
-      : MarketDataService(eventHandler, sessionOptions, sessionConfigs, serviceContextPtr) {}
+      : MarketDataService(eventHandler, sessionOptions, sessionConfigs, serviceContextPtr) {
+    this->hostHttpHeaderValueIgnorePort = true;
+  }
   virtual ~MarketDataServiceBitgetBase() {}
 #ifndef CCAPI_EXPOSE_INTERNAL
 
diff --git a/include/ccapi_cpp/service/ccapi_service.h b/include/ccapi_cpp/service/ccapi_service.h
index 7e7ae62e..8f52a82e 100644
--- a/include/ccapi_cpp/service/ccapi_service.h
+++ b/include/ccapi_cpp/service/ccapi_service.h
@@ -1254,7 +1254,8 @@ class Service : public std::enable_shared_from_this<Service> {
     }
     CCAPI_LOGGER_TRACE("connected");
     CCAPI_LOGGER_TRACE("ep.port() = " + std::to_string(ep.port()));
-    wsConnectionPtr->hostHttpHeaderValue = wsConnectionPtr->host + ':' + std::to_string(ep.port());
+    wsConnectionPtr->hostHttpHeaderValue =
+        this->hostHttpHeaderValueIgnorePort ? wsConnectionPtr->host : wsConnectionPtr->host + ':' + std::to_string(ep.port());
     CCAPI_LOGGER_TRACE("wsConnectionPtr->hostHttpHeaderValue = " + wsConnectionPtr->hostHttpHeaderValue);
     beast::websocket::stream<beast::ssl_stream<beast::tcp_stream>>& stream = *wsConnectionPtr->streamPtr;
     beast::get_lowest_layer(stream).socket().set_option(tcp::no_delay(true));
@@ -1711,6 +1712,7 @@ class Service : public std::enable_shared_from_this<Service> {
   }
   virtual void onTextMessage(std::shared_ptr<WsConnection> wsConnectionPtr, boost::beast::string_view textMessage, const TimePoint& timeReceived) {}
 #endif
+  bool hostHttpHeaderValueIgnorePort{};
   std::string apiKeyName;
   std::string apiSecretName;
   std::string exchangeName;