diff --git a/src/main.cpp b/src/main.cpp
index 369fa78..e9b5ffe 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -276,6 +276,7 @@ void loop() {
     mfs::fsensor.Step();
     mi::idler.Step();
     ms::selector.Step();
+    mu::userInput.Step();
     currentCommand->Step();
     // add a watchdog reset
 }
diff --git a/src/modules/user_input.cpp b/src/modules/user_input.cpp
index 5ee65e6..6677738 100644
--- a/src/modules/user_input.cpp
+++ b/src/modules/user_input.cpp
@@ -28,7 +28,7 @@ Event UserInput::ConsumeEvent() {
 }
 
 void UserInput::Clear() {
-    while (eventQueue.IsEmpty()) {
+    while (!eventQueue.IsEmpty()) {
         Event x;
         eventQueue.ConsumeFirst(x);
     }
diff --git a/tests/unit/logic/feed_to_bondtech/CMakeLists.txt b/tests/unit/logic/feed_to_bondtech/CMakeLists.txt
index dccbf2c..89ca67a 100644
--- a/tests/unit/logic/feed_to_bondtech/CMakeLists.txt
+++ b/tests/unit/logic/feed_to_bondtech/CMakeLists.txt
@@ -11,6 +11,7 @@ add_executable(
   ../../../../src/modules/leds.cpp
   ../../../../src/modules/permanent_storage.cpp
   ../../../../src/modules/selector.cpp
+  ../../../../src/modules/user_input.cpp
   ../../modules/stubs/stub_adc.cpp
   ../../modules/stubs/stub_eeprom.cpp
   ../../modules/stubs/stub_shr16.cpp
diff --git a/tests/unit/logic/stubs/main_loop_stub.cpp b/tests/unit/logic/stubs/main_loop_stub.cpp
index 401bf8b..39c1488 100644
--- a/tests/unit/logic/stubs/main_loop_stub.cpp
+++ b/tests/unit/logic/stubs/main_loop_stub.cpp
@@ -12,6 +12,7 @@
 #include "../../../../src/modules/motion.h"
 #include "../../../../src/modules/permanent_storage.h"
 #include "../../../../src/modules/selector.h"
+#include "../../../../src/modules/user_input.h"
 
 #include "../stubs/stub_motion.h"
 
@@ -26,6 +27,7 @@ void main_loop() {
     modules::idler::idler.Step();
     modules::selector::selector.Step();
     modules::motion::motion.Step();
+    modules::user_input::userInput.Step();
 
     modules::time::IncMillis();
 }
diff --git a/tests/unit/logic/unload_to_finda/CMakeLists.txt b/tests/unit/logic/unload_to_finda/CMakeLists.txt
index a063049..25f43a1 100644
--- a/tests/unit/logic/unload_to_finda/CMakeLists.txt
+++ b/tests/unit/logic/unload_to_finda/CMakeLists.txt
@@ -11,6 +11,7 @@ add_executable(
   ../../../../src/modules/leds.cpp
   ../../../../src/modules/permanent_storage.cpp
   ../../../../src/modules/selector.cpp
+  ../../../../src/modules/user_input.cpp
   ../../modules/stubs/stub_adc.cpp
   ../../modules/stubs/stub_eeprom.cpp
   ../../modules/stubs/stub_shr16.cpp