diff --git a/usermods/BH1750_v2/BH1750_v2.cpp b/usermods/BH1750_v2/BH1750_v2.cpp
index ec29f5b90..f033f39ed 100644
--- a/usermods/BH1750_v2/BH1750_v2.cpp
+++ b/usermods/BH1750_v2/BH1750_v2.cpp
@@ -1,13 +1,13 @@
 // force the compiler to show a warning to confirm that this file is included
 #warning **** Included USERMOD_BH1750 ****
 
-#ifndef WLED_ENABLE_MQTT
-#error "This user mod requires MQTT to be enabled."
-#endif
-
 #include "wled.h"
 #include <BH1750.h>
 
+#ifdef WLED_DISABLE_MQTT
+#error "This user mod requires MQTT to be enabled."
+#endif
+
 // the max frequency to check photoresistor, 10 seconds
 #ifndef USERMOD_BH1750_MAX_MEASUREMENT_INTERVAL
 #define USERMOD_BH1750_MAX_MEASUREMENT_INTERVAL 10000
diff --git a/usermods/BME280_v2/BME280_v2.cpp b/usermods/BME280_v2/BME280_v2.cpp
index 8cc986aa0..05aeca55a 100644
--- a/usermods/BME280_v2/BME280_v2.cpp
+++ b/usermods/BME280_v2/BME280_v2.cpp
@@ -1,15 +1,15 @@
 // force the compiler to show a warning to confirm that this file is included
 #warning **** Included USERMOD_BME280 version 2.0 ****
 
-#ifndef WLED_ENABLE_MQTT
-#error "This user mod requires MQTT to be enabled."
-#endif
-
 #include "wled.h"
 #include <Arduino.h>
 #include <BME280I2C.h>               // BME280 sensor
 #include <EnvironmentCalculations.h> // BME280 extended measurements
 
+#ifdef WLED_DISABLE_MQTT
+#error "This user mod requires MQTT to be enabled."
+#endif
+
 class UsermodBME280 : public Usermod
 {
 private:
diff --git a/usermods/DHT/DHT.cpp b/usermods/DHT/DHT.cpp
index 0b4810649..2ed3dd0ac 100644
--- a/usermods/DHT/DHT.cpp
+++ b/usermods/DHT/DHT.cpp
@@ -1,5 +1,5 @@
 #include "wled.h"
-#ifndef WLED_ENABLE_MQTT
+#ifdef WLED_DISABLE_MQTT
 #error "This user mod requires MQTT to be enabled."
 #endif
 
diff --git a/usermods/Enclosure_with_OLED_temp_ESP07/usermod.cpp b/usermods/Enclosure_with_OLED_temp_ESP07/usermod.cpp
index 823ad7472..d51ddb57c 100644
--- a/usermods/Enclosure_with_OLED_temp_ESP07/usermod.cpp
+++ b/usermods/Enclosure_with_OLED_temp_ESP07/usermod.cpp
@@ -1,11 +1,12 @@
-#ifndef WLED_ENABLE_MQTT
-#error "This user mod requires MQTT to be enabled."
-#endif
-
 #include "wled.h"
 #include <Arduino.h>
 #include <U8x8lib.h> // from https://github.com/olikraus/u8g2/
 #include <DallasTemperature.h> //Dallastemperature sensor
+
+#ifdef WLED_DISABLE_MQTT
+#error "This user mod requires MQTT to be enabled."
+#endif
+
 //The SCL and SDA pins are defined here. 
 //Lolin32 boards use SCL=5 SDA=4 
 #define U8X8_PIN_SCL 5
diff --git a/usermods/Enclosure_with_OLED_temp_ESP07/usermod_bme280.cpp b/usermods/Enclosure_with_OLED_temp_ESP07/usermod_bme280.cpp
index 29a4332db..ce3c659e8 100644
--- a/usermods/Enclosure_with_OLED_temp_ESP07/usermod_bme280.cpp
+++ b/usermods/Enclosure_with_OLED_temp_ESP07/usermod_bme280.cpp
@@ -1,13 +1,13 @@
-#ifndef WLED_ENABLE_MQTT
-#error "This user mod requires MQTT to be enabled."
-#endif
-
 #include "wled.h"
 #include <Arduino.h>
 #include <U8x8lib.h> // from https://github.com/olikraus/u8g2/
 #include <Wire.h>
 #include <BME280I2C.h> //BME280 sensor
 
+#ifdef WLED_DISABLE_MQTT
+#error "This user mod requires MQTT to be enabled."
+#endif
+
 void UpdateBME280Data();
 
 #define Celsius // Show temperature measurement in Celsius otherwise is in Fahrenheit 
diff --git a/usermods/LD2410_v2/LD2410_v2.cpp b/usermods/LD2410_v2/LD2410_v2.cpp
index 7c1c36745..095da12f2 100644
--- a/usermods/LD2410_v2/LD2410_v2.cpp
+++ b/usermods/LD2410_v2/LD2410_v2.cpp
@@ -1,12 +1,10 @@
-#warning **** Included USERMOD_LD2410 ****
-
-#ifndef WLED_ENABLE_MQTT
-#error "This user mod requires MQTT to be enabled."
-#endif
-
 #include "wled.h"
 #include <ld2410.h>
 
+#ifdef WLED_DISABLE_MQTT
+#error "This user mod requires MQTT to be enabled."
+#endif
+
 class LD2410Usermod : public Usermod {
 
   private:
diff --git a/usermods/Si7021_MQTT_HA/Si7021_MQTT_HA.cpp b/usermods/Si7021_MQTT_HA/Si7021_MQTT_HA.cpp
index 8640ceb8a..44218d596 100644
--- a/usermods/Si7021_MQTT_HA/Si7021_MQTT_HA.cpp
+++ b/usermods/Si7021_MQTT_HA/Si7021_MQTT_HA.cpp
@@ -1,7 +1,3 @@
-#ifndef WLED_ENABLE_MQTT
-#error "This user mod requires MQTT to be enabled."
-#endif
-
 // this is remixed from usermod_v2_SensorsToMqtt.h (sensors_to_mqtt usermod)
 // and usermod_multi_relay.h (multi_relay usermod)
 
@@ -9,6 +5,10 @@
 #include <Adafruit_Si7021.h>
 #include <EnvironmentCalculations.h> // EnvironmentCalculations::HeatIndex(), ::DewPoint(), ::AbsoluteHumidity()
 
+#ifdef WLED_DISABLE_MQTT
+#error "This user mod requires MQTT to be enabled."
+#endif
+
 Adafruit_Si7021 si7021;
 
 class Si7021_MQTT_HA : public Usermod
diff --git a/usermods/mqtt_switch_v2/mqtt_switch_v2.cpp b/usermods/mqtt_switch_v2/mqtt_switch_v2.cpp
index 36e2adaab..2d745863a 100644
--- a/usermods/mqtt_switch_v2/mqtt_switch_v2.cpp
+++ b/usermods/mqtt_switch_v2/mqtt_switch_v2.cpp
@@ -1,7 +1,7 @@
 #warning "This usermod is deprecated and no longer maintained. It will be removed in a future WLED release. Please use usermod multi_relay which has more features."
 
 #include "wled.h"
-#ifndef WLED_ENABLE_MQTT
+#ifdef WLED_DISABLE_MQTT
 #error "This user mod requires MQTT to be enabled."
 #endif
 
diff --git a/usermods/sensors_to_mqtt/sensors_to_mqtt.cpp b/usermods/sensors_to_mqtt/sensors_to_mqtt.cpp
index c203d4ee4..adfdffa00 100644
--- a/usermods/sensors_to_mqtt/sensors_to_mqtt.cpp
+++ b/usermods/sensors_to_mqtt/sensors_to_mqtt.cpp
@@ -1,7 +1,3 @@
-#ifndef WLED_ENABLE_MQTT
-#error "This user mod requires MQTT to be enabled."
-#endif
-
 #include "wled.h"
 #include <Arduino.h>
 #include <Adafruit_Sensor.h>
@@ -9,6 +5,10 @@
 #include <Adafruit_CCS811.h>
 #include <Adafruit_Si7021.h>
 
+#ifdef WLED_DISABLE_MQTT
+#error "This user mod requires MQTT to be enabled."
+#endif
+
 Adafruit_BMP280 bmp;
 Adafruit_Si7021 si7021;
 Adafruit_CCS811 ccs811;
diff --git a/usermods/seven_segment_display/seven_segment_display.cpp b/usermods/seven_segment_display/seven_segment_display.cpp
index de5719b22..13a6306be 100644
--- a/usermods/seven_segment_display/seven_segment_display.cpp
+++ b/usermods/seven_segment_display/seven_segment_display.cpp
@@ -1,9 +1,9 @@
-#ifndef WLED_ENABLE_MQTT
+#include "wled.h"
+
+#ifdef WLED_DISABLE_MQTT
 #error "This user mod requires MQTT to be enabled."
 #endif
 
-#include "wled.h"
-
 class SevenSegmentDisplay : public Usermod
 {
 
diff --git a/usermods/seven_segment_display_reloaded/seven_segment_display_reloaded.cpp b/usermods/seven_segment_display_reloaded/seven_segment_display_reloaded.cpp
index 418e53b21..3e6877d5d 100644
--- a/usermods/seven_segment_display_reloaded/seven_segment_display_reloaded.cpp
+++ b/usermods/seven_segment_display_reloaded/seven_segment_display_reloaded.cpp
@@ -1,9 +1,9 @@
-#ifndef WLED_ENABLE_MQTT
+#include "wled.h"
+
+#ifdef WLED_DISABLE_MQTT
 #error "This user mod requires MQTT to be enabled."
 #endif
 
-#include "wled.h"
-
 class UsermodSSDR : public Usermod {
 
 //#define REFRESHTIME 497
diff --git a/usermods/sht/sht.cpp b/usermods/sht/sht.cpp
index b269433ec..6a0e1ec45 100644
--- a/usermods/sht/sht.cpp
+++ b/usermods/sht/sht.cpp
@@ -1,9 +1,10 @@
-#ifndef WLED_ENABLE_MQTT
+#include "wled.h"
+#include "SHT85.h"
+
+#ifdef WLED_DISABLE_MQTT
 #error "This user mod requires MQTT to be enabled."
 #endif
 
-#include "SHT85.h"
-
 #define USERMOD_SHT_TYPE_SHT30 0
 #define USERMOD_SHT_TYPE_SHT31 1
 #define USERMOD_SHT_TYPE_SHT35 2
diff --git a/usermods/smartnest/smartnest.cpp b/usermods/smartnest/smartnest.cpp
index 2ff13b36e..d0cb92dcf 100644
--- a/usermods/smartnest/smartnest.cpp
+++ b/usermods/smartnest/smartnest.cpp
@@ -1,9 +1,9 @@
-#ifndef WLED_ENABLE_MQTT
+#include "wled.h"
+
+#ifdef WLED_DISABLE_MQTT
 #error "This user mod requires MQTT to be enabled."
 #endif
 
-#include "wled.h"
-
 class Smartnest : public Usermod
 {
 private: