diff --git a/src/MessageStore.cpp b/src/MessageStore.cpp
index 5aa7a8aec..ca025f5e5 100644
--- a/src/MessageStore.cpp
+++ b/src/MessageStore.cpp
@@ -1,4 +1,3 @@
-#if HAS_SCREEN
 #include "MessageStore.h"
 #include "FSCommon.h"
 #include "NodeDB.h"
@@ -393,4 +392,3 @@ void MessageStore::upgradeBootRelativeTimestamps()
 
 // Global definition
 MessageStore messageStore("default");
-#endif
\ No newline at end of file
diff --git a/src/MessageStore.h b/src/MessageStore.h
index abb7f90ea..f32a03af7 100644
--- a/src/MessageStore.h
+++ b/src/MessageStore.h
@@ -1,4 +1,3 @@
-#if HAS_SCREEN
 #pragma once
 #include "mesh/generated/meshtastic/mesh.pb.h"
 #include <cstdint>
@@ -102,4 +101,3 @@ class MessageStore
 
 // Global instance (defined in MessageStore.cpp)
 extern MessageStore messageStore;
-#endif
\ No newline at end of file
diff --git a/src/Power.cpp b/src/Power.cpp
index a994d1486..1cd38aaa7 100644
--- a/src/Power.cpp
+++ b/src/Power.cpp
@@ -759,9 +759,8 @@ void Power::shutdown()
 #endif
     nodeDB->saveToDisk();
     // === Save live messages before powering off ===
-#if HAS_SCREEN
     messageStore.saveToFlash();
-#endif
+
 #if defined(ARCH_NRF52) || defined(ARCH_ESP32) || defined(ARCH_RP2040)
 #ifdef PIN_LED1
     ledOff(PIN_LED1);
diff --git a/src/graphics/draw/MessageRenderer.h b/src/graphics/draw/MessageRenderer.h
index 9e9d83bd2..98018e90f 100644
--- a/src/graphics/draw/MessageRenderer.h
+++ b/src/graphics/draw/MessageRenderer.h
@@ -1,4 +1,3 @@
-#if HAS_SCREEN
 #pragma once
 #include "MessageStore.h" // for StoredMessage
 #include "OLEDDisplay.h"
@@ -61,5 +60,3 @@ void handleNewMessage(const StoredMessage &sm, const meshtastic_MeshPacket &pack
 
 } // namespace MessageRenderer
 } // namespace graphics
-
-#endif
\ No newline at end of file
diff --git a/src/modules/SystemCommandsModule.cpp b/src/modules/SystemCommandsModule.cpp
index c2bd72699..c2046fcd9 100644
--- a/src/modules/SystemCommandsModule.cpp
+++ b/src/modules/SystemCommandsModule.cpp
@@ -78,9 +78,7 @@ int SystemCommandsModule::handleInputEvent(const InputEvent *event)
     case INPUT_BROKER_MSG_REBOOT:
         IF_SCREEN(screen->showSimpleBanner("Rebooting...", 0));
         nodeDB->saveToDisk();
-#if HAS_SCREEN
         messageStore.saveToFlash();
-#endif
         rebootAtMsec = millis() + DEFAULT_REBOOT_SECONDS * 1000;
         // runState = CANNED_MESSAGE_RUN_STATE_INACTIVE;
         return true;
diff --git a/src/modules/TextMessageModule.cpp b/src/modules/TextMessageModule.cpp
index e16d30b22..6c54478ba 100644
--- a/src/modules/TextMessageModule.cpp
+++ b/src/modules/TextMessageModule.cpp
@@ -20,10 +20,10 @@ ProcessMessage TextMessageModule::handleReceived(const meshtastic_MeshPacket &mp
     // We only store/display messages destined for us.
     devicestate.rx_text_message = mp;
     devicestate.has_rx_text_message = true;
-#if HAS_SCREEN
+
     // Store in the central message history
     const StoredMessage &sm = messageStore.addFromPacket(mp);
-
+#if HAS_SCREEN
     // Pass message to renderer (banner + thread switching + scroll reset)
     graphics::MessageRenderer::handleNewMessage(sm, mp);
 #endif