diff --git a/wled00/cfg.cpp b/wled00/cfg.cpp
index e30be759b6..d37a395c80 100644
--- a/wled00/cfg.cpp
+++ b/wled00/cfg.cpp
@@ -734,6 +734,7 @@ bool deserializeConfig(JsonObject doc, bool fromFS) {
   CJSON(DMXGap,dmx[F("gap")]);
   CJSON(DMXStart, dmx["start"]);
   CJSON(DMXStartLED,dmx[F("start-led")]);
+  CJSON(DMXNumFixtures, dmx[F("num-fixtures")]);
 
   JsonArray dmx_fixmap = dmx[F("fixmap")];
   for (int i = 0; i < dmx_fixmap.size(); i++) {
@@ -1235,6 +1236,7 @@ void serializeConfig(JsonObject root) {
   dmx[F("gap")] = DMXGap;
   dmx["start"] = DMXStart;
   dmx[F("start-led")] = DMXStartLED;
+  dmx[F("num-fixtures")] = DMXNumFixtures;
 
   JsonArray dmx_fixmap = dmx.createNestedArray(F("fixmap"));
   for (unsigned i = 0; i < 15; i++) {
diff --git a/wled00/data/settings_dmx.htm b/wled00/data/settings_dmx.htm
index 391c2bdc97..83f7643dc2 100644
--- a/wled00/data/settings_dmx.htm
+++ b/wled00/data/settings_dmx.htm
@@ -57,14 +57,14 @@ <h2>Imma firin ma lazer (if it has DMX support)</h2><!-- TODO: Change to somethi
 
 Proxy Universe <input name=PU type=number min=0 max=63999 required> from E1.31 to DMX (0=disabled)<br>
 <i>This will disable the LED data output to DMX configurable below</i><br><br>
-<i>Number of fixtures is taken from LED config page</i><br>
 
 Channels per fixture (15 max): <input type="number" min="1" max="15" name="CN" maxlength="2" onchange="mMap();"><br />
 Start channel: <input type="number" min="1" max="512" name="CS" maxlength="2"><br />
 Spacing between start channels: <input type="number" min="1" max="512" name="CG" maxlength="2" onchange="mMap();"> [ <a href="javascript:alert('if set to 10, first fixture will start at 10,\nsecond will start at 20 etc.\nRegardless of the channel count.\nMakes memorizing channel numbers easier.');">info</a> ]<br>
 <div id="gapwarning" style="color: orange; display: none;">WARNING: Channel gap is lower than channels per fixture.<br />This will cause overlap.</div>
 <button type="button" onclick="location.href='/dmxmap';">DMX Map</button><br>
-DMX fixtures start LED: <input type="number" min="0" max="1500" name="SL">
+DMX fixtures start LED: <input type="number" min="0" max="1500" name="SL"><br>
+Number of fixtures: <input type="number" min="1" max="512" name="NF">
 <h3>Channel functions</h3>
 <div id="dmxchannels"></div>
 <hr><button type="button" onclick="B()">Back</button><button type="submit">Save</button>
diff --git a/wled00/dmx_output.cpp b/wled00/dmx_output.cpp
index eace2145e6..3e180f6815 100644
--- a/wled00/dmx_output.cpp
+++ b/wled00/dmx_output.cpp
@@ -3,21 +3,36 @@
 /*
  * Support for DMX  output via serial (e.g. MAX485).
  * Change the output pin in src/dependencies/ESPDMX.cpp, if needed (ESP8266)
- * Change the output pin in src/dependencies/SparkFunDMX.cpp, if needed (ESP32)
+ * Change the output pin in src/dependencies/dmx/EspDmxOutput.cpp, if needed (ESP32/S3)
  * ESP8266 Library from:
  * https://github.com/Rickgg/ESP-Dmx
  * ESP32 Library from:
- * https://github.com/sparkfun/SparkFunDMX
+ * https://github.com/someweisguy/esp_dmx
  */
 
 #ifdef WLED_ENABLE_DMX
 
+#define MAX_DMX_RATE 44 // max DMX update rate in Hz
+
 void handleDMXOutput()
 {
   // don't act, when in DMX Proxy mode
   if (e131ProxyUniverse != 0) return;
 
+  // Ensure segments exist before accessing strip data
+  if (strip.getSegmentsNum() == 0) return;
+
+  // Rate limiting
+  static unsigned long last_dmx_time = 0;
+  const unsigned long dmxFrameTime = (1000UL + MAX_DMX_RATE - 1) / MAX_DMX_RATE;
+  if (millis() - last_dmx_time < dmxFrameTime) return;
+
   uint8_t brightness = strip.getBrightness();
+  
+  // Skip DMX entirely if strip is off
+  if (brightness == 0) return;
+
+  last_dmx_time = millis();
 
   bool calc_brightness = true;
 
@@ -28,9 +43,15 @@ void handleDMXOutput()
    }
 
   uint16_t len = strip.getLengthTotal();
-  for (int i = DMXStartLED; i < len; i++) {        // uses the amount of LEDs as fixture count
-
-    uint32_t in = strip.getPixelColor(i);     // get the colors for the individual fixtures as suggested by Aircoookie in issue #462
+  if (len == 0) return;
+  
+  // OPTIMIZATION: Only process the LEDs that actually need DMX output
+  // Limit to configured number of fixtures instead of processing all LEDs
+  uint16_t dmxEndLED = DMXStartLED + DMXNumFixtures;
+  if (dmxEndLED > len) dmxEndLED = len;
+  
+  for (int i = DMXStartLED; i < dmxEndLED; i++) {
+    uint32_t in = strip.getPixelColor(i);
     byte w = W(in);
     byte r = R(in);
     byte g = G(in);
diff --git a/wled00/set.cpp b/wled00/set.cpp
index 2a633bf07d..bfa217af4d 100644
--- a/wled00/set.cpp
+++ b/wled00/set.cpp
@@ -640,6 +640,10 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage)
     if (t>=0 && t < MAX_LEDS) {
       DMXStartLED = t;
     }
+    t = request->arg(F("NF")).toInt();
+    if (t>0 && t<=512) {
+      DMXNumFixtures = t;
+    }
     for (int i=0; i<15; i++) {
       String argname = "CH" + String((i+1));
       t = request->arg(argname).toInt();
diff --git a/wled00/src/dependencies/dmx/EspDmxOutput.cpp b/wled00/src/dependencies/dmx/EspDmxOutput.cpp
new file mode 100644
index 0000000000..96856fe96e
--- /dev/null
+++ b/wled00/src/dependencies/dmx/EspDmxOutput.cpp
@@ -0,0 +1,93 @@
+/******************************************************************************
+ * EspDmxOutput.cpp
+ *
+ * DMX output via `esp_dmx` on ESP32.
+ * Keeps the minimal API WLED uses: initWrite(), write(), update().
+ ******************************************************************************/
+
+/* ----- LIBRARIES ----- */
+#if defined(ARDUINO_ARCH_ESP32)
+
+#include <Arduino.h>
+#if !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S2)
+
+#include "EspDmxOutput.h"
+#include <esp_dmx.h>
+
+#define dmxMaxChannel 512
+#define defaultMax 32
+
+// Some new MCUs (-S2, -C3) don't have HardwareSerial(2)
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 2, 0)
+  #if SOC_UART_NUM < 3
+  #error DMX output is not possible on your MCU, as it does not have HardwareSerial(2)
+  #endif
+#endif
+
+static constexpr dmx_port_t dmxPort = DMX_NUM_2;
+
+// Pin defaults. Change these if needed for your hardware.
+static const int txPin = 2;                  // transmit DMX data over this pin (default is GPIO2)
+static const int rxPin = DMX_PIN_NO_CHANGE;  // RX unused for DMX output
+static const int rtsPin = DMX_PIN_NO_CHANGE; // RS485 DE/RE pin (UART RTS). Set to a GPIO to control transceiver direction.
+
+// DMX value array and size. Entry 0 holds start code, so we need 512+1 elements.
+static uint8_t dmxData[DMX_PACKET_SIZE] = {0};
+// Maximum slot count configured by initWrite() (includes start code slot 0).
+static size_t maxSize = 0;
+// Current transmit size (includes start code slot 0). This grows as channels are written.
+static size_t txSize = 1;
+static bool dmxInstalled = false;
+
+void EspDmxOutput::initWrite(int chanQuant) {
+  if (chanQuant > dmxMaxChannel || chanQuant <= 0) chanQuant = defaultMax;
+  maxSize = static_cast<size_t>(chanQuant) + 1; // +1 for start code
+  txSize = 1;                                   // start with just start code
+
+  // Configure the driver if needed.
+  if (!dmx_driver_is_installed(dmxPort)) {
+    dmx_config_t config = DMX_CONFIG_DEFAULT;
+    dmxInstalled = dmx_driver_install(dmxPort, &config, DMX_INTR_FLAGS_DEFAULT);
+  } else {
+    dmxInstalled = true;
+  }
+
+  if (dmxInstalled) {
+    dmx_set_pin(dmxPort, txPin, rxPin, rtsPin);
+
+    // Ensure NULL start code (slot 0).
+    dmxData[0] = DMX_SC;
+    dmx_write_slot(dmxPort, 0, DMX_SC);
+  }
+}
+
+void EspDmxOutput::write(int Channel, uint8_t value) {
+  if (!dmxInstalled) return;
+
+  // Allow slot 0 writes, but start code is enforced in update().
+  if (Channel < 0) Channel = 0;
+  if (Channel > dmxMaxChannel) Channel = dmxMaxChannel;
+
+  const size_t neededSize = static_cast<size_t>(Channel) + 1;
+  if (neededSize > txSize) txSize = neededSize;
+  if (maxSize > 0 && txSize > maxSize) txSize = maxSize;
+  if (txSize > DMX_PACKET_SIZE) txSize = DMX_PACKET_SIZE;
+
+  dmxData[Channel] = value;
+  dmx_write_slot(dmxPort, static_cast<size_t>(Channel), value);
+}
+
+void EspDmxOutput::update() {
+  if (!dmxInstalled) return;
+
+  // Always send the break signal first
+  dmx_write_slot(dmxPort, 0, DMX_SC);
+
+  // Send the frame currently staged in the driver buffer.
+  dmx_send(dmxPort, txSize);
+}
+
+#endif
+#endif
+
+
diff --git a/wled00/src/dependencies/dmx/EspDmxOutput.h b/wled00/src/dependencies/dmx/EspDmxOutput.h
new file mode 100644
index 0000000000..48f38a2dc6
--- /dev/null
+++ b/wled00/src/dependencies/dmx/EspDmxOutput.h
@@ -0,0 +1,17 @@
+/*
+ * EspDmxOutput.h
+ *
+ * WLED DMX output implementation for ESP32 using the `esp_dmx` library.
+ */
+#pragma once
+
+#include <inttypes.h>
+
+class EspDmxOutput {
+public:
+  void initWrite(int maxChan);
+  void write(int channel, uint8_t value);
+  void update();
+};
+
+
diff --git a/wled00/src/dependencies/dmx/SparkFunDMX.cpp b/wled00/src/dependencies/dmx/SparkFunDMX.cpp
deleted file mode 100644
index 064b9ff620..0000000000
--- a/wled00/src/dependencies/dmx/SparkFunDMX.cpp
+++ /dev/null
@@ -1,182 +0,0 @@
-/******************************************************************************
-SparkFunDMX.h
-Arduino Library for the SparkFun ESP32 LED to DMX Shield
-Andy England @ SparkFun Electronics
-7/22/2019
-
-Development environment specifics:
-Arduino IDE 1.6.4
-
-This code is released under the [MIT License](http://opensource.org/licenses/MIT).
-Please review the LICENSE.md file included with this example. If you have any questions 
-or concerns with licensing, please contact techsupport@sparkfun.com.
-Distributed as-is; no warranty is given.
-******************************************************************************/
-
-/* ----- LIBRARIES ----- */
-#if defined(ARDUINO_ARCH_ESP32)
-
-#include <Arduino.h>
-#if !defined(CONFIG_IDF_TARGET_ESP32C3)  && !defined(CONFIG_IDF_TARGET_ESP32S2)
-
-#include "SparkFunDMX.h"
-#include <HardwareSerial.h>
-
-#define dmxMaxChannel  512
-#define defaultMax 32
-
-#define DMXSPEED       250000
-#define DMXFORMAT      SERIAL_8N2
-#define BREAKSPEED     83333
-#define BREAKFORMAT    SERIAL_8N1
-
-static const int enablePin = -1;		// disable the enable pin because it is not needed
-static const int rxPin = -1;       // disable the receiving pin because it is not needed - softhack007: Pin=-1 means "use default" not "disable"
-static const int txPin = 2;        // transmit DMX data over this pin (default is pin 2)
-
-//DMX value array and size. Entry 0 will hold startbyte, so we need 512+1 elements
-static uint8_t dmxData[dmxMaxChannel+1] = { 0 };
-static int chanSize = 0;
-#if !defined(DMX_SEND_ONLY)
-static int currentChannel = 0;
-#endif
-
-// Some new MCUs (-S2, -C3) don't have HardwareSerial(2)
-#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 2, 0)
-  #if SOC_UART_NUM < 3
-  #error DMX output is not possible on your MCU, as it does not have HardwareSerial(2)
-  #endif
-#endif
-
-static HardwareSerial DMXSerial(2);
-
-/* Interrupt Timer for DMX Receive */
-#if !defined(DMX_SEND_ONLY)
-static hw_timer_t * timer = NULL;
-static portMUX_TYPE timerMux = portMUX_INITIALIZER_UNLOCKED;
-#endif
-
-static volatile int _interruptCounter = 0;
-static volatile bool _startCodeDetected = false;
-
-
-#if !defined(DMX_SEND_ONLY)
-/* Start Code is detected by 21 low interrupts */
-void IRAM_ATTR onTimer() {
-	if ((rxPin >= 0) && (digitalRead(rxPin) == 1))
-	{
-		_interruptCounter = 0; //If the RX Pin is high, we are not in an interrupt
-	}
-	else
-	{
-		_interruptCounter++;
-	}
-	if (_interruptCounter > 9)
-	{	
-		portENTER_CRITICAL_ISR(&timerMux);
-		_startCodeDetected = true;
-		DMXSerial.begin(DMXSPEED, DMXFORMAT, rxPin, txPin);
-		portEXIT_CRITICAL_ISR(&timerMux);
-		_interruptCounter = 0;
-	}
-}
-
-void SparkFunDMX::initRead(int chanQuant) {
-	
-  timer = timerBegin(0, 1, true);
-  timerAttachInterrupt(timer, &onTimer, true);
-  timerAlarmWrite(timer, 320, true);
-  timerAlarmEnable(timer);
-  _READWRITE = _READ;
-  if (chanQuant > dmxMaxChannel || chanQuant <= 0) 
-  {
-    chanQuant = defaultMax;
-  }
-  chanSize = chanQuant;
-  if (enablePin >= 0) {
-    pinMode(enablePin, OUTPUT);
-    digitalWrite(enablePin, LOW);
-  }
-  if (rxPin >= 0) pinMode(rxPin, INPUT);
-}
-#endif
-
-// Set up the DMX-Protocol
-void SparkFunDMX::initWrite (int chanQuant) {
-
-  _READWRITE = _WRITE;
-  if (chanQuant > dmxMaxChannel || chanQuant <= 0) {
-    chanQuant = defaultMax;
-  }
-
-  chanSize = chanQuant + 1; //Add 1 for start code
-
-  DMXSerial.begin(DMXSPEED, DMXFORMAT, rxPin, txPin);
-  if (enablePin >= 0) {
-    pinMode(enablePin, OUTPUT);
-    digitalWrite(enablePin, HIGH);
-  }
-}
-
-#if !defined(DMX_SEND_ONLY)
-// Function to read DMX data
-uint8_t SparkFunDMX::read(int Channel) {
-  if (Channel > chanSize) Channel = chanSize;
-  return(dmxData[Channel - 1]); //subtract one to account for start byte
-}
-#endif
-
-// Function to send DMX data
-void SparkFunDMX::write(int Channel, uint8_t value) {
-  if (Channel < 0) Channel = 0;
-  if (Channel > chanSize) chanSize = Channel;
-  dmxData[0] = 0;
-  dmxData[Channel] = value; //add one to account for start byte
-}
-
-
-
-void SparkFunDMX::update() {
-  if (_READWRITE == _WRITE)
-  {
-    //Send DMX break
-    digitalWrite(txPin, HIGH);
-    DMXSerial.begin(BREAKSPEED, BREAKFORMAT, rxPin, txPin);//Begin the Serial port
-    DMXSerial.write(0);
-    DMXSerial.flush();
-    delay(1);
-    DMXSerial.end();
-    
-    //Send DMX data
-    DMXSerial.begin(DMXSPEED, DMXFORMAT, rxPin, txPin);//Begin the Serial port
-    DMXSerial.write(dmxData, chanSize);
-    DMXSerial.flush();
-    DMXSerial.end();//clear our DMX array, end the Hardware Serial port
-  }
-#if !defined(DMX_SEND_ONLY)
-  else if (_READWRITE == _READ)//In a perfect world, this function ends serial communication upon packet completion and attaches RX to a CHANGE interrupt so the start code can be read again
-  { 
-	if (_startCodeDetected == true)
-	{
-		while (DMXSerial.available())
-		{
-			dmxData[currentChannel++] = DMXSerial.read();
-		}
-	if (currentChannel > chanSize) //Set the channel counter back to 0 if we reach the known end size of our packet
-	{
-		
-      portENTER_CRITICAL(&timerMux);
-	  _startCodeDetected = false;
-	  DMXSerial.flush();
-	  DMXSerial.end();
-      portEXIT_CRITICAL(&timerMux);
-	  currentChannel = 0;
-	}
-	}
-  }
-#endif
-}
-
-// Function to update the DMX bus
-#endif
-#endif
diff --git a/wled00/src/dependencies/dmx/SparkFunDMX.h b/wled00/src/dependencies/dmx/SparkFunDMX.h
deleted file mode 100644
index 73861153b2..0000000000
--- a/wled00/src/dependencies/dmx/SparkFunDMX.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/******************************************************************************
-SparkFunDMX.h
-Arduino Library for the SparkFun ESP32 LED to DMX Shield
-Andy England @ SparkFun Electronics
-7/22/2019
-
-Development environment specifics:
-Arduino IDE 1.6.4
-
-This code is released under the [MIT License](http://opensource.org/licenses/MIT).
-Please review the LICENSE.md file included with this example. If you have any questions 
-or concerns with licensing, please contact techsupport@sparkfun.com.
-Distributed as-is; no warranty is given.
-******************************************************************************/
-
-#include <inttypes.h>
-
-
-#ifndef SparkFunDMX_h
-#define SparkFunDMX_h
-
-#define DMX_SEND_ONLY // this disables DMX sending features, and saves us two GPIO pins
-
-// ---- Methods ----
-
-class SparkFunDMX {
-public:
-  void initWrite(int maxChan);
-#if !defined(DMX_SEND_ONLY)
-  void initRead(int maxChan);
-  uint8_t read(int Channel);
-#endif
-  void write(int channel, uint8_t value);
-  void update();
-private:
-  const uint8_t _startCodeValue = 0xFF;
-  const bool _READ = true;
-  const bool _WRITE = false;
-  bool _READWRITE;
-};
-
-#endif
\ No newline at end of file
diff --git a/wled00/xml.cpp b/wled00/xml.cpp
index 194256d82e..f7a3e054b2 100644
--- a/wled00/xml.cpp
+++ b/wled00/xml.cpp
@@ -636,6 +636,7 @@ void getSettingsJS(byte subPage, Print& settingsScript)
     printSetFormValue(settingsScript,PSTR("CG"),DMXGap);
     printSetFormValue(settingsScript,PSTR("CS"),DMXStart);
     printSetFormValue(settingsScript,PSTR("SL"),DMXStartLED);
+    printSetFormValue(settingsScript,PSTR("NF"),DMXNumFixtures);
 
     printSetFormIndex(settingsScript,PSTR("CH1"),DMXFixtureMap[0]);
     printSetFormIndex(settingsScript,PSTR("CH2"),DMXFixtureMap[1]);