diff --git a/variants/thinknode_m6/platformio.ini b/variants/thinknode_m6/platformio.ini
index 6fe9043668..72f4167253 100644
--- a/variants/thinknode_m6/platformio.ini
+++ b/variants/thinknode_m6/platformio.ini
@@ -85,12 +85,15 @@ build_flags =
   -D OFFLINE_QUEUE_SIZE=256
   -D AUTO_SHUTDOWN_MILLIVOLTS=3300
   -D QSPIFLASH=1
+  -D DISPLAY_CLASS=NullDisplayDriver
+  -D PIN_STATUS_LED=PIN_LED_RED
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 build_src_filter = ${ThinkNode_M6.build_src_filter}
   +<helpers/nrf52/SerialBLEInterface.cpp>
   +<helpers/ui/MomentaryButton.cpp>
   +<../examples/companion_radio/*.cpp>
+  +<../examples/companion_radio/ui-new/*.cpp>
 lib_deps =
   ${ThinkNode_M6.lib_deps}
   densaugeo/base64 @ ~1.4.0
@@ -109,10 +112,13 @@ build_flags =
   -D QSPIFLASH=1
   -D OFFLINE_QUEUE_SIZE=256
   -D AUTO_SHUTDOWN_MILLIVOLTS=3300
+  -D DISPLAY_CLASS=NullDisplayDriver
+  -D PIN_STATUS_LED=PIN_LED_RED
 build_src_filter = ${ThinkNode_M6.build_src_filter}
   +<helpers/ui/buzzer.cpp>
   +<helpers/ui/MomentaryButton.cpp>
   +<../examples/companion_radio/*.cpp>
+  +<../examples/companion_radio/ui-new/*.cpp>
 lib_deps =
   ${ThinkNode_M6.lib_deps}
   densaugeo/base64 @ ~1.4.0
diff --git a/variants/thinknode_m6/target.h b/variants/thinknode_m6/target.h
index 76188e584e..07ff322947 100644
--- a/variants/thinknode_m6/target.h
+++ b/variants/thinknode_m6/target.h
@@ -10,7 +10,9 @@
 #include <helpers/sensors/EnvironmentSensorManager.h>
 #include <helpers/sensors/LocationProvider.h>
 #ifdef DISPLAY_CLASS
-  #include <helpers/ui/GxEPDDisplay.h>
+  // The M6 is screenless; DISPLAY_CLASS=NullDisplayDriver is used only to run
+  // UITask headless so the status LED (PIN_STATUS_LED) and button work.
+  #include <helpers/ui/NullDisplayDriver.h>
   #include <helpers/ui/MomentaryButton.h>
 #endif