diff --git a/src/input/InputBroker.cpp b/src/input/InputBroker.cpp
index 5ca890b43..c588a9a0f 100644
--- a/src/input/InputBroker.cpp
+++ b/src/input/InputBroker.cpp
@@ -18,14 +18,22 @@ void InputBroker::registerSource(Observable<const InputEvent *> *source)
 }
 
 #ifdef HAS_FREE_RTOS
-void InputBroker::pollSoonRequestFromIsr(InputPollable *pollable)
+void InputBroker::requestPollSoon(InputPollable *pollable)
 {
-    xQueueSendFromISR(pollSoonQueue, &pollable, NULL);
+    if (xPortInIsrContext() == pdTRUE) {
+        xQueueSendFromISR(pollSoonQueue, &pollable, NULL);
+    } else {
+        xQueueSend(pollSoonQueue, &pollable, 0);
+    }
 }
 
 void InputBroker::queueInputEvent(const InputEvent *event)
 {
-    xQueueSend(inputEventQueue, event, portMAX_DELAY);
+    if (xPortInIsrContext() == pdTRUE) {
+        xQueueSendFromISR(inputEventQueue, event, NULL);
+    } else {
+        xQueueSend(inputEventQueue, event, portMAX_DELAY);
+    }
 }
 
 void InputBroker::processInputEventQueue()
diff --git a/src/input/InputBroker.h b/src/input/InputBroker.h
index 82af184f3..192bd7e8b 100644
--- a/src/input/InputBroker.h
+++ b/src/input/InputBroker.h
@@ -60,7 +60,7 @@ class InputBroker : public Observable<const InputEvent *>
     void registerSource(Observable<const InputEvent *> *source);
     void injectInputEvent(const InputEvent *event) { handleInputEvent(event); }
 #ifdef HAS_FREE_RTOS
-    void pollSoonRequestFromIsr(InputPollable *pollable);
+    void requestPollSoon(InputPollable *pollable);
     void queueInputEvent(const InputEvent *event);
     void processInputEventQueue();
 #endif
diff --git a/src/input/RotaryEncoderImpl.cpp b/src/input/RotaryEncoderImpl.cpp
index 213dd4faa..7b43fa256 100644
--- a/src/input/RotaryEncoderImpl.cpp
+++ b/src/input/RotaryEncoderImpl.cpp
@@ -30,7 +30,7 @@ bool RotaryEncoderImpl::init()
     rotary->resetButton();
 
     interruptInstance = this;
-    auto interruptHandler = []() { inputBroker->pollSoonRequestFromIsr(interruptInstance); };
+    auto interruptHandler = []() { inputBroker->requestPollSoon(interruptInstance); };
     attachInterrupt(moduleConfig.canned_message.inputbroker_pin_a, interruptHandler, CHANGE);
     attachInterrupt(moduleConfig.canned_message.inputbroker_pin_b, interruptHandler, CHANGE);
     attachInterrupt(moduleConfig.canned_message.inputbroker_pin_press, interruptHandler, CHANGE);