diff --git a/tasmota/xdrv_31_tasmota_client.ino b/tasmota/xdrv_31_tasmota_client.ino
index 1708df44f..3fdbad076 100644
--- a/tasmota/xdrv_31_tasmota_client.ino
+++ b/tasmota/xdrv_31_tasmota_client.ino
@@ -503,15 +503,17 @@ void CmndClientReset(void) {
 }
 
 void CmndClientSend(void) {
-  if (0 < XdrvMailbox.data_len) {
-    TasmotaClient_sendCmnd(CMND_CLIENT_SEND, XdrvMailbox.data_len);
-    TasmotaClient_Serial->write(char(PARAM_DATA_START));
-    for (uint8_t idx = 0; idx < XdrvMailbox.data_len; idx++) {
-      TasmotaClient_Serial->write(XdrvMailbox.data[idx]);
+  if (TClient.SerialEnabled) {
+    if (0 < XdrvMailbox.data_len) {
+      TasmotaClient_sendCmnd(CMND_CLIENT_SEND, XdrvMailbox.data_len);
+      TasmotaClient_Serial->write(char(PARAM_DATA_START));
+      for (uint8_t idx = 0; idx < XdrvMailbox.data_len; idx++) {
+        TasmotaClient_Serial->write(XdrvMailbox.data[idx]);
+      }
+      TasmotaClient_Serial->write(char(PARAM_DATA_END));
     }
-    TasmotaClient_Serial->write(char(PARAM_DATA_END));
+    ResponseCmndDone();
   }
-  ResponseCmndDone();
 }
 
 void TasmotaClient_ProcessIn(void) {