diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d4459c12..58e77685c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,9 @@ All notable changes to this project will be documented in this file.
 - Force ESP32 defines USE_UFILESYS, GUI_TRASH_FILE and #define GUI_EDIT_FILE
 - Speed up initial GUI console refresh
 
+### Fixed
+- ESP32 Webcam add boundary marker before sending mjpeg image (#12376)
+
 ## [Released]
 
 ## [9.5.0] 20210617
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index f1ee81834..79b28e696 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -104,6 +104,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl http://ota.tasmo
 - Speed up initial GUI console refresh
 
 ### Fixed
+- ESP32 Webcam add boundary marker before sending mjpeg image [#12376](https://github.com/arendst/Tasmota/issues/12376)
 
 ### Noted
 - ESP32 single core **tasmota32solo1.bin** binary can only be uploaded using the GUI as OTA upload will trigger the watchdog timer
\ No newline at end of file
diff --git a/tasmota/xdrv_81_esp32_webcam.ino b/tasmota/xdrv_81_esp32_webcam.ino
index 41df7d111..e3b15fd3c 100644
--- a/tasmota/xdrv_81_esp32_webcam.ino
+++ b/tasmota/xdrv_81_esp32_webcam.ino
@@ -791,6 +791,7 @@ void HandleWebcamMjpegTask(void) {
       _jpg_buf = wc_fb->buf;
     }
 
+    Wc.client.print("--" BOUNDARY "\r\n");
     Wc.client.printf("Content-Type: image/jpeg\r\n"
       "Content-Length: %d\r\n"
       "\r\n", static_cast<int>(_jpg_buf_len));
@@ -801,7 +802,8 @@ void HandleWebcamMjpegTask(void) {
       Wc.stream_active=0;
       AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: Send fail"));
     }*/
-    Wc.client.print("\r\n--" BOUNDARY "\r\n");
+//    Wc.client.print("\r\n--" BOUNDARY "\r\n");
+    Wc.client.print("\r\n");
 
 #ifdef COPYFRAME
     if (tmp_picstore.buff) { free(tmp_picstore.buff); }