diff --git a/es-core/src/components/DateTimeComponent.cpp b/es-core/src/components/DateTimeComponent.cpp
index 04a1c7433..f111c8756 100644
--- a/es-core/src/components/DateTimeComponent.cpp
+++ b/es-core/src/components/DateTimeComponent.cpp
@@ -145,6 +145,9 @@ void DateTimeComponent::applyTheme(const std::shared_ptr<ThemeData>& theme,
             LOG(LogError) << "Unknown text alignment string: " << str;
     }
 
+    if (properties & METADATA && elem->has("metadata"))
+        setMetadataField(elem->get<std::string>("metadata"));
+
     if (properties & FORCE_UPPERCASE && elem->has("forceUppercase"))
         setUppercase(elem->get<bool>("forceUppercase"));
 
diff --git a/es-core/src/components/TextComponent.cpp b/es-core/src/components/TextComponent.cpp
index cf6d16ec0..805aaafb3 100644
--- a/es-core/src/components/TextComponent.cpp
+++ b/es-core/src/components/TextComponent.cpp
@@ -323,6 +323,9 @@ void TextComponent::applyTheme(const std::shared_ptr<ThemeData>& theme,
     if (properties & TEXT && elem->has("text"))
         setText(elem->get<std::string>("text"));
 
+    if (properties & METADATA && elem->has("metadata"))
+        setMetadataField(elem->get<std::string>("metadata"));
+
     if (properties & FORCE_UPPERCASE && elem->has("forceUppercase"))
         setUppercase(elem->get<bool>("forceUppercase"));