diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c9b3d2d2..aec0d2afe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,10 +25,12 @@ All notable changes to this project will be documented in this file.
 - ESP32 support for energy margin checks, like ``MaxPower2`` per phase (#21695)
 - ESP32 TM1621 number overflow from "9999" to "12E3" (#21131)
 - ESP32 platform update from 2024.06.11 to 2024.07.10 (#21745)
+- ESP32 platform update from 2024.07.10 to 2024.07.11 (#21765)
 
 ### Fixed
 - Berry `bytes.resize()` for large sizes (#21716)
 - On universal display remove default backlight power if a single PWM channel is used for backlight. Regression from 14.0.0.1 (#21726)
+- ESP32 I2S fixes (#21770)
 
 ### Removed
 
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 075953155..160da8eac 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -151,7 +151,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasm
 ### Changed
 - ESP8266 platform update from 2024.01.01 to 2024.06.00 [#21668](https://github.com/arendst/Tasmota/issues/21668)
 - ESP8266 Framework (Arduino Core) from v2.7.6 to v2.7.7 [#21668](https://github.com/arendst/Tasmota/issues/21668)
-- ESP32 platform update from 2024.05.13 to 2024.07.10 [#21745](https://github.com/arendst/Tasmota/issues/21745)
+- ESP32 platform update from 2024.05.13 to 2024.07.11 [#21765](https://github.com/arendst/Tasmota/issues/21765)
 - ESP32 Framework (Arduino Core) from v3.0.0 to v3.0.2 [#21694](https://github.com/arendst/Tasmota/issues/21694)
 - Optional MQTT_TELE_RETAIN to Energy Margins message replaced by ``SensorRetain``
 - Display timing splash screen with display modes 1 to 5
@@ -174,6 +174,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasm
 - Shutter MQTT on inverted shutter [#21663](https://github.com/arendst/Tasmota/issues/21663)
 - Scripter TCP server [#21660](https://github.com/arendst/Tasmota/issues/21660)
 - ESP32 allow use of UART0 with enabled USB_CDC_CONSOLE [#21496](https://github.com/arendst/Tasmota/issues/21496)
+- ESP32 I2S fixes [#21770](https://github.com/arendst/Tasmota/issues/21770)
 - Berry `input()` returns empty string and does not crash [#21565](https://github.com/arendst/Tasmota/issues/21565)
 - Berry `bytes.resize()` for large sizes [#21716](https://github.com/arendst/Tasmota/issues/21716)
 - Matter interverted attributes 0xFFF9 and 0xFFFB [#21636](https://github.com/arendst/Tasmota/issues/21636)
diff --git a/tasmota/tasmota_xdsp_display/xdsp_17_universal.ino b/tasmota/tasmota_xdsp_display/xdsp_17_universal.ino
index b56bf6d47..625e4fa68 100644
--- a/tasmota/tasmota_xdsp_display/xdsp_17_universal.ino
+++ b/tasmota/tasmota_xdsp_display/xdsp_17_universal.ino
@@ -212,16 +212,16 @@ Renderer *Init_uDisplay(const char *desc) {
     if (cp) {
       // 9 params nr,cs,sclk,mosi,dc,bl,reset,miso,mhz
       // SPI,1,*,*,*,*,*,*,*,80
-      // SPI,*,*,*,*,*,*,*,*,40
+      // SPI,3,*,*,*,*,*,*,*,40
       cp += 4;
       // 1,*,*,*,*,*,*,*,80
-      uint32_t spi_type = 10;  // SPI,3 = Software SPI
-      if (isdigit(*cp) && (*cp != '0')) {
-        spi_type = *cp - '1';  // SPI,1 = 0, SPI,2 = 1
+      uint32_t spi_type = 2;   // SPI,3 = Software SPI
+      if ((*cp == '1') || (*cp == '2')) {
+        spi_type = *cp - '1';  // SPI,1 = 0, SPI,2 = 1 etc
       }
       cp += 2;
       // *,*,*,*,*,*,*,80
-      if (spi_type < 2) {
+      if (spi_type < 2) {      // SPI,1 or SPI,2
         replacepin(&cp, Pin(GPIO_SPI_CS, spi_type));
         replacepin(&cp, Pin(GPIO_SPI_CLK, spi_type));
         replacepin(&cp, Pin(GPIO_SPI_MOSI, spi_type));
@@ -229,8 +229,7 @@ Renderer *Init_uDisplay(const char *desc) {
         replacepin(&cp, Pin(GPIO_BACKLIGHT));
         replacepin(&cp, Pin(GPIO_OLED_RESET));
         replacepin(&cp, Pin(GPIO_SPI_MISO, spi_type));
-      } else {
-        // Soft spi pins
+      } else {                 // SPI,3 is software SPI
         replacepin(&cp, Pin(GPIO_SSPI_CS));
         replacepin(&cp, Pin(GPIO_SSPI_SCLK));
         replacepin(&cp, Pin(GPIO_SSPI_MOSI));