diff --git a/Makefile b/Makefile
index 7c4006c..7fb3ad3 100644
--- a/Makefile
+++ b/Makefile
@@ -83,7 +83,7 @@ ENABLE_SIDE_BUTT_MENU            := 0
 # Key Lock 400 B
 ENABLE_KEYLOCK                   := 0
 ENABLE_PANADAPTER                := 1
-ENABLE_PANADAPTER_PEAK_FREQ      := 1
+ENABLE_PANADAPTER_PEAK_FREQ      := 0
 #ENABLE_SINGLE_VFO_CHAN          := 0
 
 #############################################################
diff --git a/firmware.bin b/firmware.bin
index 6e49d5d..2aa820a 100644
Binary files a/firmware.bin and b/firmware.bin differ
diff --git a/firmware.packed.bin b/firmware.packed.bin
index 5a4c82a..5f3bb55 100644
Binary files a/firmware.packed.bin and b/firmware.packed.bin differ
diff --git a/panadapter.c b/panadapter.c
index ecfc4ee..dd17fe0 100644
--- a/panadapter.c
+++ b/panadapter.c
@@ -61,8 +61,6 @@ void PAN_set_freq(void)
 
 void PAN_process_10ms(void)
 {
-	uint16_t rssi;
-
 	if (!g_eeprom.config.setting.panadapter         ||
 	#ifdef ENABLE_FMRADIO
 		 g_fm_radio_mode                            ||
@@ -113,11 +111,8 @@ void PAN_process_10ms(void)
 	{	// we have a signal on the VFO frequency
 
 		// save the current RSSI value .. center bin is the VFO frequency
-		rssi = g_current_rssi[g_eeprom.config.setting.tx_vfo_num];
-		//if (g_tx_vfo->channel.mod_mode == MOD_MODE_FM)
-			g_panadapter_rssi[PANADAPTER_BINS] = (rssi <= 255) ? rssi : 255;
-
-//		g_update_display = true;
+		const int16_t rssi = g_current_rssi[g_eeprom.config.setting.tx_vfo_num];
+		g_panadapter_rssi[PANADAPTER_BINS] = (rssi > 255) ? 255 : (rssi < 0) ? 0 : rssi;
 
 		g_panadapter_vfo_mode = 50;   // pause scanning for at least another 500ms
 		return;
@@ -127,7 +122,7 @@ void PAN_process_10ms(void)
 	{	// scanning
 
 		// save the current RSSI value
-		rssi = BK4819_GetRSSI();
+		const uint16_t rssi = BK4819_GetRSSI();
 		g_panadapter_rssi[panadapter_rssi_index] = (rssi <= 255) ? rssi : 255;
 
 		// next frequency