diff --git a/companion/src/storage/categorized.cpp b/companion/src/storage/categorized.cpp
index e6aef817a..63f98ffa7 100644
--- a/companion/src/storage/categorized.cpp
+++ b/companion/src/storage/categorized.cpp
@@ -42,7 +42,8 @@ bool CategorizedStorageFormat::write(const RadioData & radioData)
   if (st == STORAGE_TYPE_UNKNOWN) {
     st = probeFormat();
   }
-  if (st == STORAGE_TYPE_ETX || st == STORAGE_TYPE_UNKNOWN) {
+  if (st == STORAGE_TYPE_ETX || st == STORAGE_TYPE_YML ||
+      st == STORAGE_TYPE_UNKNOWN) {
     return writeYaml(radioData);
   } else {
     return writeBin(radioData);