diff --git a/radio/src/storage/conversions/conversions_216_218.cpp b/radio/src/storage/conversions/conversions_216_218.cpp
index 67590c85d6c..82466b2c235 100644
--- a/radio/src/storage/conversions/conversions_216_218.cpp
+++ b/radio/src/storage/conversions/conversions_216_218.cpp
@@ -991,7 +991,7 @@ void convertModelData_216_to_217(ModelData &model)
         sw.v2 = convertSource_216_to_217((uint8_t)sw.v2);
       }
     }
-    else if (cstate == LS_FAMILY_BOOL || cstate == LS_FAMILY_STICKY) {
+    else if (cstate == LS_FAMILY_BOOL || cstate == LS_FAMILY_STICKY || cstate == LS_FAMILY_SAFE ) {
       sw.v1 = convertSwitch_216_to_217(sw.v1);
       sw.v2 = convertSwitch_216_to_217(sw.v2);
     }
@@ -1170,7 +1170,7 @@ void convertModelData_217_to_218(ModelData &model)
         sw.v2 = convertSource_217_to_218((uint8_t)sw.v2);
       }
     }
-    else if (cstate == LS_FAMILY_BOOL || cstate == LS_FAMILY_STICKY) {
+    else if (cstate == LS_FAMILY_BOOL || cstate == LS_FAMILY_STICKY || cstate == LS_FAMILY_SAFE) {
       sw.v1 = convertSwitch_217_to_218(sw.v1);
       sw.v2 = convertSwitch_217_to_218(sw.v2);
     }
diff --git a/radio/src/storage/conversions/conversions_218_219.cpp b/radio/src/storage/conversions/conversions_218_219.cpp
index 798d293094c..b68c45a2c65 100644
--- a/radio/src/storage/conversions/conversions_218_219.cpp
+++ b/radio/src/storage/conversions/conversions_218_219.cpp
@@ -181,7 +181,7 @@ void convertModelData_218_to_219(ModelData &model)
         sw.v2 = convertSource_218_to_219(sw.v2);
       }
     }
-    else if (cstate == LS_FAMILY_BOOL || cstate == LS_FAMILY_STICKY) {
+    else if (cstate == LS_FAMILY_BOOL || cstate == LS_FAMILY_STICKY || cstate == LS_FAMILY_SAFE) {
       sw.v1 = convertSwitch_218_to_219(sw.v1);
       sw.v2 = convertSwitch_218_to_219(sw.v2);
     }