diff --git a/src/modules/CannedMessageModule.cpp b/src/modules/CannedMessageModule.cpp
index 79cb5eee6..419507952 100644
--- a/src/modules/CannedMessageModule.cpp
+++ b/src/modules/CannedMessageModule.cpp
@@ -144,14 +144,18 @@ int CannedMessageModule::handleInputEvent(const InputEvent *event)
 
     bool validEvent = false;
     if (event->inputEvent == static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_UP)) {
-        // LOG_DEBUG("Canned message event UP\n");
-        this->runState = CANNED_MESSAGE_RUN_STATE_ACTION_UP;
-        validEvent = true;
+        if (this->messagesCount > 0) {
+            // LOG_DEBUG("Canned message event UP\n");
+            this->runState = CANNED_MESSAGE_RUN_STATE_ACTION_UP;
+            validEvent = true;
+        }
     }
     if (event->inputEvent == static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_DOWN)) {
-        // LOG_DEBUG("Canned message event DOWN\n");
-        this->runState = CANNED_MESSAGE_RUN_STATE_ACTION_DOWN;
-        validEvent = true;
+        if (this->messagesCount > 0) {
+            // LOG_DEBUG("Canned message event DOWN\n");
+            this->runState = CANNED_MESSAGE_RUN_STATE_ACTION_DOWN;
+            validEvent = true;
+        }
     }
     if (event->inputEvent == static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_SELECT)) {
         LOG_DEBUG("Canned message event Select\n");