diff --git a/app/app.c b/app/app.c
index 9a7f7839..c4709355 100644
--- a/app/app.c
+++ b/app/app.c
@@ -702,8 +702,12 @@ static void MR_NextChannel(void)
 	{
 		chan = RADIO_FindNextChannel(gNextMrChannel + gScanState, gScanState, (gEeprom.SCAN_LIST_DEFAULT < 2) ? true : false, gEeprom.SCAN_LIST_DEFAULT);
 		if (chan == 0xFF)
-			return;
-
+		{	// no valid channel found
+	
+			chan = MR_CHANNEL_FIRST;
+//			return;
+		}
+		
 		gNextMrChannel = chan;
 	}
 
diff --git a/firmware.bin b/firmware.bin
index e3ddb23f..4ca57594 100644
Binary files a/firmware.bin and b/firmware.bin differ
diff --git a/firmware.packed.bin b/firmware.packed.bin
index 9e3a921b..afe96052 100644
Binary files a/firmware.packed.bin and b/firmware.packed.bin differ