diff --git a/ear-production-suite-plugins/lib/src/programme_store_adm_serializer.cpp b/ear-production-suite-plugins/lib/src/programme_store_adm_serializer.cpp
index 1d5442327..76ad2fa06 100644
--- a/ear-production-suite-plugins/lib/src/programme_store_adm_serializer.cpp
+++ b/ear-production-suite-plugins/lib/src/programme_store_adm_serializer.cpp
@@ -332,8 +332,10 @@ ProgrammeStoreAdmSerializer::serializeToggleElement(
 void ProgrammeStoreAdmSerializer::serializeProgramme(
     adm::Document& doc, const proto::Programme& programme) {
   auto prog = adm::AudioProgramme::create(
-      adm::AudioProgrammeName{programme.name()},
-      adm::AudioProgrammeLanguage{programme.language()});
+      adm::AudioProgrammeName{programme.name()});
+  if(programme.has_language() && !programme.language().empty()) {
+    prog->set(adm::AudioProgrammeLanguage{ programme.language() });
+  }
   auto defaultContent =
       adm::AudioContent::create(adm::AudioContentName{programme.name()});
   doc.add(prog);