diff --git a/src/model_menus.cpp b/src/model_menus.cpp
index 6c2467079..2a67305e3 100644
--- a/src/model_menus.cpp
+++ b/src/model_menus.cpp
@@ -1030,7 +1030,7 @@ void menuModelSetup(uint8_t event)
         if (attr && m_posHorz==1) {
           s_editMode = 0;
           if (event==EVT_KEY_BREAK(KEY_ENTER)) {
-            pxxFlag = PXX_SEND_RXNUM;
+            pxxFlag ^= PXX_SEND_RXNUM;
           }
         }
 
diff --git a/src/pulses_arm.cpp b/src/pulses_arm.cpp
index 33e1c1a59..c813b49fe 100644
--- a/src/pulses_arm.cpp
+++ b/src/pulses_arm.cpp
@@ -310,9 +310,8 @@ void setupPulsesPXX()
   putPcmByte(g_model.modelId);
 
   /* FLAG1 */
-  if (pxxFlag == PXX_SEND_RXNUM) {
+  if (pxxFlag & PXX_SEND_RXNUM) {
     putPcmByte((g_model.rfProtocol << 6) | (g_eeGeneral.countryCode << 1) | pxxFlag);
-    pxxFlag = 0; // reset flag after send
   }
   else {
     putPcmByte((g_model.rfProtocol << 6) | pxxFlag);