diff --git a/BUILDS.md b/BUILDS.md
index cbf0198f7..fec3cfac9 100644
--- a/BUILDS.md
+++ b/BUILDS.md
@@ -122,6 +122,7 @@ m = minimal, l = lite, t = tasmota, k = knx, s = sensors, i = ir, d = display
 | USE_MGC3130           | - | - | - / - | - | - | - | - |
 | USE_MAX44009          | - | - | - / - | - | - | - | - |
 | USE_SCD30             | - | - | - / x | - | x | - | - |
+| USE_SCD40             | - | - | - / x | - | x | - | - |
 | USE_SPS30             | - | - | - / - | - | - | - | - |
 | USE_ADE7953           | - | - | x / x | x | x | - | x |
 | USE_VL53L0X           | - | - | - / x | - | x | - | - |
diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index 0bf113f9e..ce9d0212b 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -606,6 +606,7 @@
 //  #define USE_MGC3130                            // [I2cDriver27] Enable MGC3130 Electric Field Effect Sensor (I2C address 0x42) (+2k7 code, 0k3 mem)
 //  #define USE_MAX44009                           // [I2cDriver28] Enable MAX44009 Ambient Light sensor (I2C addresses 0x4A and 0x4B) (+0k8 code)
 //  #define USE_SCD30                              // [I2cDriver29] Enable Sensiron SCd30 CO2 sensor (I2C address 0x61) (+3k3 code)
+//  #define USE_SCD40                              // [I2cDriver62] Enable Sensiron SCd40/Scd41 CO2 sensor (I2C address 0x62) (+tbd code)
 //  #define USE_SPS30                              // [I2cDriver30] Enable Sensiron SPS30 particle sensor (I2C address 0x69) (+1.7 code)
   #define USE_ADE7953                            // [I2cDriver7] Enable ADE7953 Energy monitor as used on Shelly 2.5 (I2C address 0x38) (+1k5)
 //  #define USE_VL53L0X                            // [I2cDriver31] Enable VL53L0x time of flight sensor (I2C address 0x29) (+4k code)
diff --git a/tasmota/support_features.ino b/tasmota/support_features.ino
index 114809a00..a02f76645 100644
--- a/tasmota/support_features.ino
+++ b/tasmota/support_features.ino
@@ -768,7 +768,9 @@ void ResponseAppendFeatures(void)
 #ifdef USE_VINDRIKTNING
     feature8 |= 0x00002000;  // xsns_91_vindriktning.ino
 #endif
-//    feature8 |= 0x00004000;
+#if defined(USE_I2C) && defined(USE_SCD40)
+    feature8 |= 0x00004000;  // xsns_92_scd40.ino
+#endif
 //    feature8 |= 0x00008000;
 
 //    feature8 |= 0x00010000;
diff --git a/tasmota/tasmota_configurations.h b/tasmota/tasmota_configurations.h
index bdcb005cc..298d4db01 100644
--- a/tasmota/tasmota_configurations.h
+++ b/tasmota/tasmota_configurations.h
@@ -107,6 +107,7 @@
 //#define USE_MGC3130                            // [I2cDriver27] Enable MGC3130 Electric Field Effect Sensor (I2C address 0x42) (+2k7 code, 0k3 mem)
 //#define USE_MAX44009                           // [I2cDriver28] Enable MAX44009 Ambient Light sensor (I2C addresses 0x4A and 0x4B) (+0k8 code)
 #define USE_SCD30                              // [I2cDriver29] Enable Sensiron SCd30 CO2 sensor (I2C address 0x61) (+3k3 code)
+#define USE_SCD40                              // [I2cDriver62] Enable Sensiron SCd40 CO2 sensor (I2C address 0x62) (+tbd code)
 //#define USE_SPS30                              // [I2cDriver30] Enable Sensiron SPS30 particle sensor (I2C address 0x69) (+1.7 code)
 #define USE_ADE7953                            // [I2cDriver7] Enable ADE7953 Energy monitor as used on Shelly 2.5 (I2C address 0x38) (+1k5)
 #define USE_VL53L0X                            // [I2cDriver31] Enable VL53L0x time of flight sensor (I2C address 0x29) (+4k code)
diff --git a/tasmota/tasmota_configurations_ESP32.h b/tasmota/tasmota_configurations_ESP32.h
index 383621de6..850aa5b28 100644
--- a/tasmota/tasmota_configurations_ESP32.h
+++ b/tasmota/tasmota_configurations_ESP32.h
@@ -259,6 +259,7 @@
 //#define USE_MGC3130                            // [I2cDriver27] Enable MGC3130 Electric Field Effect Sensor (I2C address 0x42) (+2k7 code, 0k3 mem)
 //#define USE_MAX44009                           // [I2cDriver28] Enable MAX44009 Ambient Light sensor (I2C addresses 0x4A and 0x4B) (+0k8 code)
 //#define USE_SCD30                              // [I2cDriver29] Enable Sensiron SCd30 CO2 sensor (I2C address 0x61) (+3k3 code)
+//#define USE_SCD40                              // [I2cDriver62] Enable Sensiron SCd40 CO2 sensor (I2C address 0x62) (+tbd code) (not tested yet on ESP32)
 //#define USE_SPS30                              // [I2cDriver30] Enable Sensiron SPS30 particle sensor (I2C address 0x69) (+1.7 code)
 //#define USE_ADE7953                            // [I2cDriver7] Enable ADE7953 Energy monitor as used on Shelly 2.5 (I2C address 0x38) (+1k5)
 //#define USE_VL53L0X                            // [I2cDriver31] Enable VL53L0x time of flight sensor (I2C address 0x29) (+4k code)
@@ -393,6 +394,7 @@
 //#define USE_MGC3130                            // [I2cDriver27] Enable MGC3130 Electric Field Effect Sensor (I2C address 0x42) (+2k7 code, 0k3 mem)
 //#define USE_MAX44009                           // [I2cDriver28] Enable MAX44009 Ambient Light sensor (I2C addresses 0x4A and 0x4B) (+0k8 code)
 #define USE_SCD30                              // [I2cDriver29] Enable Sensiron SCd30 CO2 sensor (I2C address 0x61) (+3k3 code)
+//#define USE_SCD40                              // [I2cDriver62] Enable Sensiron SCd40 CO2 sensor (I2C address 0x62) (+tbd code) (not tested yet on ESP32)
 //#define USE_SPS30                              // [I2cDriver30] Enable Sensiron SPS30 particle sensor (I2C address 0x69) (+1.7 code)
 #define USE_ADE7953                            // [I2cDriver7] Enable ADE7953 Energy monitor as used on Shelly 2.5 (I2C address 0x38) (+1k5)
 #define USE_VL53L0X                            // [I2cDriver31] Enable VL53L0x time of flight sensor (I2C address 0x29) (+4k code)
diff --git a/tools/decode-status.py b/tools/decode-status.py
index e406bd6e0..a626cd8ae 100755
--- a/tools/decode-status.py
+++ b/tools/decode-status.py
@@ -256,7 +256,7 @@ a_features = [[
     "USE_MPU_ACCEL","USE_TFMINIPLUS","USE_CSE7761","USE_BERRY",
     "USE_BM8563","USE_ENERGY_DUMMY","USE_AM2320","USE_T67XX",
     "USE_MCP2515","USE_TASMESH","USE_WIFI_RANGE_EXTENDER","USE_INFLUXDB",
-    "USE_HRG15","USE_VINDRIKTNING","","",
+    "USE_HRG15","USE_VINDRIKTNING","USE_SCD40","",
     "","","","",
     "","","","",
     "","","","",