diff --git a/src/graphics/draw/MenuHandler.cpp b/src/graphics/draw/MenuHandler.cpp
index 2b9e39bbc..ff10ca6c7 100644
--- a/src/graphics/draw/MenuHandler.cpp
+++ b/src/graphics/draw/MenuHandler.cpp
@@ -160,6 +160,7 @@ void menuHandler::DeviceRolePicker()
         if (selected == Back) {
             menuHandler::menuQueue = menuHandler::lora_Menu;
             screen->runNow();
+            return;
         } else if (selected == devicerole_client) {
             config.device.role = meshtastic_Config_DeviceConfig_Role_CLIENT;
         } else if (selected == devicerole_clientmute) {