diff --git a/src/core/main.c b/src/core/main.c
index 59f6350f..c042ff4b 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -212,9 +212,7 @@ int main(int argc, char *argv[]) {
     gif_cnt = 0;
 
     // 8.1 set initial analog module power state
-#if defined(HDZGOGGLE2) || defined(HDZBOXPRO)
     Analog_Module_Power(0);
-#endif
 
     // Head alarm
     head_alarm_init();
diff --git a/src/driver/dm5680.c b/src/driver/dm5680.c
index 36b81516..dee9d3df 100644
--- a/src/driver/dm5680.c
+++ b/src/driver/dm5680.c
@@ -325,8 +325,16 @@ void DM5680_ResetHDMI_RX(uint8_t on) // Reset HDMI_RX,0=reset
 
 void DM5680_ExternalAnalog_Power(uint8_t on) {
     uint8_t Cmd[5] = {0xAA, 0x55, 0x02, 0x6, 0x00};
-    // Note Cmd[4] = 1 means power on for external analog module
-    Cmd[4] = on;
+	#if defined(HDZGOGGLE)
+      // Note Cmd[4] = 0 means power on for external analog module
+	Cmd[4] = !on;
+    #elif defined(HDZBOXPRO)
+      // keep above goggle logic for boxpro in case it is used
+      Cmd[4] = !on;
+    #elif defined(HDZGOGGLE2)
+      // Note Cmd[4] = 1 means power on for external analog module
+      Cmd[4] = on;
+    #endif
     // LOGI("DM5680_ExternalAnalog_Power %d", on);
     Cmd_to_DM5680(1, Cmd, 5);
 }
diff --git a/src/driver/hardware-goggle.c b/src/driver/hardware-goggle.c
index 1bebbd74..585092fc 100644
--- a/src/driver/hardware-goggle.c
+++ b/src/driver/hardware-goggle.c
@@ -1200,7 +1200,6 @@ void Analog_Module_Power(bool ForceSet) {
             }
         }
         if ((Analog_Module_Power_State_Last != Analog_Module_Power_State) || (ForceSet == 1)) {
-            beep();
             Analog_Module_Power_State_Last = Analog_Module_Power_State;
             DM5680_ExternalAnalog_Power(Analog_Module_Power_State);
         }
diff --git a/src/driver/hardware-goggle2.c b/src/driver/hardware-goggle2.c
index b04efefa..93cdffcb 100755
--- a/src/driver/hardware-goggle2.c
+++ b/src/driver/hardware-goggle2.c
@@ -1206,7 +1206,6 @@ void Analog_Module_Power(bool ForceSet) {
             }
         }
         if ((Analog_Module_Power_State_Last != Analog_Module_Power_State) || (ForceSet == 1)) {
-            beep();
             Analog_Module_Power_State_Last = Analog_Module_Power_State;
             DM5680_ExternalAnalog_Power(Analog_Module_Power_State);
         }
diff --git a/src/ui/page_source.c b/src/ui/page_source.c
index e8dfe755..9f22323c 100644
--- a/src/ui/page_source.c
+++ b/src/ui/page_source.c
@@ -371,6 +371,7 @@ static void page_source_on_click(uint8_t key, int sel) {
         }
         break;
     }
+    Analog_Module_Power(0);
 }
 
 static void page_source_enter() {