diff --git a/Projects/B-L475E-IOT01A/Applications/WiFi/Common/Src/es_wifi.c b/Projects/B-L475E-IOT01A/Applications/WiFi/Common/Src/es_wifi.c
index 30912f671..2873982aa 100644
--- a/Projects/B-L475E-IOT01A/Applications/WiFi/Common/Src/es_wifi.c
+++ b/Projects/B-L475E-IOT01A/Applications/WiFi/Common/Src/es_wifi.c
@@ -1761,13 +1761,13 @@ ES_WIFI_Status_t ES_WIFI_StartClientConnection(ES_WIFIObject_t *Obj, ES_WIFI_Con
     ret = AT_ExecuteCommand(Obj, Obj->CmdData, Obj->CmdData);
   }
 
-  if ((ret == ES_WIFI_STATUS_OK)&& ((conn->Type == ES_WIFI_TCP_CONNECTION) || (conn->Type == ES_WIFI_TCP_SSL_CONNECTION)))
+  if (ret == ES_WIFI_STATUS_OK)
   {
     sprintf((char*)Obj->CmdData,"P4=%d\r", conn->RemotePort);
     ret = AT_ExecuteCommand(Obj, Obj->CmdData, Obj->CmdData);
   }
 
-  if ((ret == ES_WIFI_STATUS_OK) && ((conn->Type == ES_WIFI_TCP_CONNECTION) || (conn->Type == ES_WIFI_TCP_SSL_CONNECTION)))
+  if (ret == ES_WIFI_STATUS_OK)
   {
     sprintf((char*)Obj->CmdData,"P3=%d.%d.%d.%d\r", conn->RemoteIP[0],conn->RemoteIP[1],
             conn->RemoteIP[2],conn->RemoteIP[3]);
diff --git a/Projects/B-L4S5I-IOT01A/Applications/WiFi/Common/Src/es_wifi.c b/Projects/B-L4S5I-IOT01A/Applications/WiFi/Common/Src/es_wifi.c
index d954ec85c..92f9a03ed 100644
--- a/Projects/B-L4S5I-IOT01A/Applications/WiFi/Common/Src/es_wifi.c
+++ b/Projects/B-L4S5I-IOT01A/Applications/WiFi/Common/Src/es_wifi.c
@@ -1773,13 +1773,13 @@ ES_WIFI_Status_t ES_WIFI_StartClientConnection(ES_WIFIObject_t *Obj, ES_WIFI_Con
     ret = AT_ExecuteCommand(Obj, Obj->CmdData, Obj->CmdData);
   }
 
-  if ((ret == ES_WIFI_STATUS_OK)&& ((conn->Type == ES_WIFI_TCP_CONNECTION) || (conn->Type == ES_WIFI_TCP_SSL_CONNECTION)))
+  if (ret == ES_WIFI_STATUS_OK)
   {
     sprintf((char*)Obj->CmdData,"P4=%d\r", conn->RemotePort);
     ret = AT_ExecuteCommand(Obj, Obj->CmdData, Obj->CmdData);
   }
 
-  if ((ret == ES_WIFI_STATUS_OK) && ((conn->Type == ES_WIFI_TCP_CONNECTION) || (conn->Type == ES_WIFI_TCP_SSL_CONNECTION)))
+  if (ret == ES_WIFI_STATUS_OK)
   {
     sprintf((char*)Obj->CmdData,"P3=%d.%d.%d.%d\r", conn->RemoteIP[0],conn->RemoteIP[1],
             conn->RemoteIP[2],conn->RemoteIP[3]);