diff --git a/radio/src/storage/conversions/conversions_219_220.cpp b/radio/src/storage/conversions/conversions_219_220.cpp
index 9fb21e390..6227964b5 100644
--- a/radio/src/storage/conversions/conversions_219_220.cpp
+++ b/radio/src/storage/conversions/conversions_219_220.cpp
@@ -43,7 +43,7 @@
 //    uint32_t countdownBeep:2;
 //    uint32_t minuteBeep:1;
 //    uint32_t persistent:2;
-//    int32_t  countdownStart:2;
+//    int32_t  countdownStart:2;  // -2=30s -1=20s 0=10s 1=5s converted to -2=5s -1=10s 0=20s 1=30s
 // -  uint32_t direction:1;
 //    NOBACKUP(char name[LEN_TIMER_NAME]);
 //  });
@@ -125,7 +125,7 @@ void convertModelData_219_to_220(ModelData &model)
       timer.mode = timer_219.mode;
     }
     else {
-      timer.mode = TMRMODE_START;
+      timer.mode = TMRMODE_ON;
       if (timer_219.mode > 0)
         timer.swtch = timer_219.mode - (TMRMODE_COUNT - 1);
       else
@@ -133,7 +133,12 @@ void convertModelData_219_to_220(ModelData &model)
     }
 
     timer.start = timer_219.start;
-    
+    timer.value = timer_219.value;
+    timer.countdownBeep = timer_219.countdownBeep;
+    timer.minuteBeep = timer_219.minuteBeep;
+    timer.persistent = timer_219.persistent;
+    timer.countdownStart = (timer_219.countdownStart * -1) - 1;
+
   }
 
   // MixData::name
@@ -175,7 +180,7 @@ void convertModelData_219_to_220(ModelData &model)
     convertToStr(model.scriptsData[i].file, LEN_SCRIPT_FILENAME);
     convertToStr(model.scriptsData[i].name, LEN_SCRIPT_NAME);
   }
-  
+
   // Input names
   for (uint8_t i=0; i<MAX_INPUTS_219; ++i) {
     convertToStr(model.inputNames[i], LEN_INPUT_NAME_219);
diff --git a/radio/src/tests/conversions.cpp b/radio/src/tests/conversions.cpp
index 87c8c5cc5..d3ab29e9f 100644
--- a/radio/src/tests/conversions.cpp
+++ b/radio/src/tests/conversions.cpp
@@ -54,7 +54,7 @@ TEST(Conversions, ConversionX9DPFrom23)
   EXPECT_EQ(SWITCH_3POS, SWITCH_CONFIG(0));
 
   EXPECT_STRNEQ("Test", g_model.header.name); // ZSTREQ
-  EXPECT_EQ(TMRMODE_START, g_model.timers[0].mode); // new!
+  EXPECT_EQ(TMRMODE_ON, g_model.timers[0].mode); // new!
   EXPECT_EQ(SWSRC_SA0, g_model.timers[0].swtch); // new!
   EXPECT_EQ(80, g_model.mixData[0].weight);
   EXPECT_EQ(-100, g_model.limitData[0].max); // 90.0
@@ -96,8 +96,8 @@ TEST(Conversions, ConversionX9DPFrom23_2)
   EXPECT_EQ(944, g_eeGeneral.calib[0].mid);
   EXPECT_EQ(770, g_eeGeneral.calib[0].spanPos);
 
-  EXPECT_EQ(TMRMODE_START, g_model.timers[0].mode); // new!
-  EXPECT_EQ(-SWSRC_SA0, g_model.timers[0].swtch); // new!  
+  EXPECT_EQ(TMRMODE_ON, g_model.timers[0].mode); // new!
+  EXPECT_EQ(-SWSRC_SA0, g_model.timers[0].swtch); // new!
 }
 #endif
 
@@ -164,14 +164,14 @@ TEST(Conversions, ConversionX9DPFrom23_2)
 //   EXPECT_EQ(8, g_eeGeneral.speakerVolume);
 //   EXPECT_EQ('e', g_eeGeneral.ttsLanguage[0]);
 //   EXPECT_EQ('n', g_eeGeneral.ttsLanguage[1]);
-  
+
 //   EXPECT_EQ(SWSRC_TELEMETRY_STREAMING, g_eeGeneral.customFn[0].swtch);
 //   EXPECT_EQ(FUNC_LOGS, g_eeGeneral.customFn[0].func);
 //   EXPECT_EQ(20, g_eeGeneral.customFn[0].all.val);
 
 //   EXPECT_ZSTREQ("Tes", g_eeGeneral.switchNames[0]);
 //   EXPECT_EQ(SWITCH_3POS, SWITCH_CONFIG(0));
-  
+
 //   EXPECT_ZSTREQ("Test", g_model.header.name);
 //   EXPECT_EQ(MODULE_TYPE_R9M_PXX1, g_model.moduleData[EXTERNAL_MODULE].type);
 //   EXPECT_EQ(MODULE_SUBTYPE_R9M_EU, g_model.moduleData[EXTERNAL_MODULE].subType);