diff --git a/code/espurna/config/arduino.h b/code/espurna/config/arduino.h
index ae43569b..e1c47ef4 100644
--- a/code/espurna/config/arduino.h
+++ b/code/espurna/config/arduino.h
@@ -117,6 +117,7 @@
 //#define THINGSPEAK_SUPPORT     0
 //#define UART_MQTT_SUPPORT      1
 //#define WEB_SUPPORT            0
+//#define GEIGER_SUPPORT         1
 
 //--------------------------------------------------------------------------------
 // Sensors (values below are non-default values)
diff --git a/code/espurna/config/hardware.h b/code/espurna/config/hardware.h
index d8361c4f..396c366f 100644
--- a/code/espurna/config/hardware.h
+++ b/code/espurna/config/hardware.h
@@ -70,6 +70,12 @@
     #define LED1_PIN            2
     #define LED1_PIN_INVERSE    1
 
+#elif defined(NODEMCU_BASIC)
+    // Info
+    // Generic NodeMCU Board without any buttons or relays connected.
+    #define MANUFACTURER        "NODEMCU"
+    #define DEVICE              "BASIC"
+
 #elif defined(WEMOS_D1_MINI_RELAYSHIELD)
 
     // Info
diff --git a/code/platformio.ini b/code/platformio.ini
index df5b94be..783e6542 100644
--- a/code/platformio.ini
+++ b/code/platformio.ini
@@ -2224,3 +2224,14 @@ upload_speed = 115200
 upload_port = "${env.ESPURNA_IP}"
 upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266
 extra_scripts = ${common.extra_scripts}
+
+[env:nodemcu-geiger]
+platform = ${common.platform}
+framework = arduino
+board = nodemcu
+lib_deps = ${common.lib_deps}
+lib_ignore = ${common.lib_ignore}
+build_flags = ${common.build_flags} -DNODEMCU_BASIC -DNOWSAUTH -DGEIGER_SUPPORT=1 -DEVENTS_SUPPORT=0 -DINFLUXDB_SUPPORT=1 -DALEXA_SUPPORT=0 -DALEXA_ENABLED=0
+upload_speed = 460800
+monitor_speed = 115200
+extra_scripts = ${common.extra_scripts}