diff --git a/lib/device-ui b/lib/device-ui
index 901020302..1f07291e7 160000
--- a/lib/device-ui
+++ b/lib/device-ui
@@ -1 +1 @@
-Subproject commit 901020302a8e6b174142488d117eb916e5212781
+Subproject commit 1f07291e7e06cd050e4a3e9e65d326399a77b038
diff --git a/src/graphics/Screen.cpp b/src/graphics/Screen.cpp
index 6417d702e..a1ba657f8 100644
--- a/src/graphics/Screen.cpp
+++ b/src/graphics/Screen.cpp
@@ -1575,7 +1575,7 @@ Screen::Screen(ScanI2C::DeviceAddress address, meshtastic_Config_DisplayConfig_O
 #elif defined(USE_SSD1306)
     dispdev = new SSD1306Wire(address.address, -1, -1, geometry,
                               (address.port == ScanI2C::I2CPort::WIRE1) ? HW_I2C::I2C_TWO : HW_I2C::I2C_ONE);
-#elif defined(ST7735_CS) || defined(ILI9341_DRIVER) || defined(ST7789_CS) || defined(RAK14014) || defined(HX8357_CS) && !HAS_TFT
+#elif defined(ST7735_CS) || defined(ILI9341_DRIVER) || defined(ST7789_CS) || defined(RAK14014) || defined(HX8357_CS)
     dispdev = new TFTDisplay(address.address, -1, -1, geometry,
                              (address.port == ScanI2C::I2CPort::WIRE1) ? HW_I2C::I2C_TWO : HW_I2C::I2C_ONE);
 #elif defined(USE_EINK) && !defined(USE_EINK_DYNAMICDISPLAY)
@@ -1587,7 +1587,7 @@ Screen::Screen(ScanI2C::DeviceAddress address, meshtastic_Config_DisplayConfig_O
 #elif defined(USE_ST7567)
     dispdev = new ST7567Wire(address.address, -1, -1, geometry,
                              (address.port == ScanI2C::I2CPort::WIRE1) ? HW_I2C::I2C_TWO : HW_I2C::I2C_ONE);
-#elif ARCH_PORTDUINO && !HAS_TFT
+#elif ARCH_PORTDUINO
     if (settingsMap[displayPanel] != no_screen) {
         LOG_DEBUG("Making TFTDisplay!\n");
         dispdev = new TFTDisplay(address.address, -1, -1, geometry,
diff --git a/src/modules/CannedMessageModule.cpp b/src/modules/CannedMessageModule.cpp
index c5dfa1f3c..1755a485f 100644
--- a/src/modules/CannedMessageModule.cpp
+++ b/src/modules/CannedMessageModule.cpp
@@ -2,7 +2,7 @@
 #if ARCH_PORTDUINO
 #include "PortduinoGlue.h"
 #endif
-#if HAS_SCREEN || HAS_TFT
+#if HAS_SCREEN
 #include "CannedMessageModule.h"
 #include "Channels.h"
 #include "FSCommon.h"
diff --git a/src/modules/CannedMessageModule.h b/src/modules/CannedMessageModule.h
index ab21e513e..6bb43bdf2 100644
--- a/src/modules/CannedMessageModule.h
+++ b/src/modules/CannedMessageModule.h
@@ -1,5 +1,5 @@
 #pragma once
-#if HAS_SCREEN || HAS_TFT
+#if HAS_SCREEN
 #include "ProtobufModule.h"
 #include "input/InputBroker.h"
 
diff --git a/src/modules/Modules.cpp b/src/modules/Modules.cpp
index d0aa16057..ebecdc0bf 100644
--- a/src/modules/Modules.cpp
+++ b/src/modules/Modules.cpp
@@ -126,7 +126,7 @@ void setupModules()
         kbMatrixImpl->init();
 #endif // INPUTBROKER_MATRIX_TYPE
 #endif // HAS_BUTTON
-#if ARCH_PORTDUINO
+#if ARCH_PORTDUINO && !HAS_TFT
         aLinuxInputImpl = new LinuxInputImpl();
         aLinuxInputImpl->init();
 #endif
@@ -134,7 +134,7 @@ void setupModules()
         trackballInterruptImpl1 = new TrackballInterruptImpl1();
         trackballInterruptImpl1->init();
 #endif
-#if (HAS_SCREEN || HAS_TFT) && !MESHTASTIC_EXCLUDE_CANNEDMESSAGES
+#if HAS_SCREEN && !MESHTASTIC_EXCLUDE_CANNEDMESSAGES
         cannedMessageModule = new CannedMessageModule();
 #endif
 #if HAS_TELEMETRY
diff --git a/variants/portduino/platformio.ini b/variants/portduino/platformio.ini
index 3919f6c4b..4e2c323e7 100644
--- a/variants/portduino/platformio.ini
+++ b/variants/portduino/platformio.ini
@@ -14,6 +14,7 @@ extends = portduino_base
 build_type = debug
 build_flags = ${portduino_base.build_flags} -O0 -fsanitize=address -lX11 -linput -lxkbcommon
   -D ARCH_PORTDUINO
+  -D MESHTASTIC_EXCLUDE_CANNEDMESSAGES=1
   -I variants/portduino
   -I /usr/include
   -D DEBUG_HEAP
@@ -55,6 +56,7 @@ extends = portduino_base
 build_type = release
 build_flags = ${portduino_base.build_flags} -Ofast -lX11 -linput -lxkbcommon
   -D ARCH_PORTDUINO
+  -D MESHTASTIC_EXCLUDE_CANNEDMESSAGES=1
   -I variants/portduino
   -I /usr/include
   -D RAM_SIZE=16384
diff --git a/variants/t-deck/platformio.ini b/variants/t-deck/platformio.ini
index 08ccd9c59..a4c921d55 100644
--- a/variants/t-deck/platformio.ini
+++ b/variants/t-deck/platformio.ini
@@ -7,6 +7,7 @@ board_check = true
 upload_protocol = esptool
 build_flags = ${esp32_base.build_flags} -fno-omit-frame-pointer
 	-D T_DECK
+  -D MESHTASTIC_EXCLUDE_CANNEDMESSAGES=1
   -D MAX_THREADS=40
   -D HAS_SCREEN=0
   -D HAS_TFT=1