diff --git a/qml/ui/sidebar/MavlinkChoiceElement2.qml b/qml/ui/sidebar/MavlinkChoiceElement2.qml
index 07fdc60ae..67d61c400 100644
--- a/qml/ui/sidebar/MavlinkChoiceElement2.qml
+++ b/qml/ui/sidebar/MavlinkChoiceElement2.qml
@@ -141,11 +141,11 @@ BaseJoyEditElement2{
         }else{
             m_param_exists=m_settings_model.param_int_exists(m_param_id)
         }
-        // if(!m_param_exists){
-        //     console.log("Param "+m_param_id+" does not exist");
-        //     populate_display_text="NOT\nAVAILABLE";
-        //     return;
-        // }
+        if(!m_param_exists){
+            console.log("Param "+m_param_id+" does not exist");
+            populate_display_text="NOT\nAVAILABLE";
+            return;
+        }
         if(override_takes_string_param){
             var actual_value_string=m_settings_model.get_cached_string(m_param_id);
             update_display_text(actual_value_string);
@@ -254,6 +254,9 @@ BaseJoyEditElement2{
             populate_display_text="N/A";
             return;
         }
+        if(m_param_id==mPARAM_ID_FREQUENCY_SCAN){
+                m_param_exists=true;
+            }
         if(m_param_id==mPARAM_ID_FREQUENCY){
             if(curr_channel_mhz<=0){
                 m_param_exists=false;