diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/metatags.twig b/addons/default/visiosoft/base-theme/resources/views/partials/metatags.twig
index 7e42a34fb..bfcd78be2 100644
--- a/addons/default/visiosoft/base-theme/resources/views/partials/metatags.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/partials/metatags.twig
@@ -4,7 +4,8 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="generator" content="{{ config_get('streams::distribution.name') }}"/>
 <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
-<meta name="description" content="{{ template.get('meta_description', setting_value('streams::description'))|slice(0,160) }}"/>
+<meta name="description"
+      content="{{ (template.get('meta_description') ?: setting_value('streams::description'))|slice(0,160) }}"/>
 <meta name="keywords" content="{{ template.get('meta_keywords') }}" />
 <!-- Meta Tags -->
 
diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/ogdata.twig b/addons/default/visiosoft/base-theme/resources/views/partials/ogdata.twig
index 27ab95745..810cb9fcd 100644
--- a/addons/default/visiosoft/base-theme/resources/views/partials/ogdata.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/partials/ogdata.twig
@@ -2,7 +2,7 @@
     <meta property="og:site_name"
           content="{{ template.get('og_site_name', setting_value('streams::name', config_get('streams::distribution.name'))) }}"/>
     <meta property="og:description" content="{{ template.get('og_description', trans(template.meta_description))|slice(0,160) }}"/>
-    <meta property="og:title" content="{{ template.get('og_title', trans(template.meta_title))|slice(0,60) }}"/>
+    <meta property="og:title" content="{{ (setting_value('streams::name', config_get('streams::distribution.name'))~" | "~trans(template.meta_title))|slice(0,60) }}"/>
     <meta property="og:url" content="{{ template.get('og_url', url_current()) }}"/>
     <meta property="og:image" content="{{ template.get('og_image', trans(template.meta_image)) }}"/>
     <meta property="og:type" content="website"/>
@@ -10,7 +10,7 @@
     <!-- Meta for twitter sharing -->
     <meta name="twitter:card" content="summary_large_image">
     <meta name="twitter:site" content="{{ template.get('og_site_name', setting_value('streams::name', config_get('streams::distribution.name'))) }}">
-    <meta name="twitter:title" content="{{ template.get('og_title', trans(template.meta_title))|slice(0,60) }}">
+    <meta name="twitter:title" content="{{ (setting_value('streams::name', config_get('streams::distribution.name'))~" | "~trans(template.meta_title))|slice(0,60) }}">
     <meta name="twitter:description" content="{{ template.get('og_description', trans(template.meta_description))|slice(0,160) }}">
     <meta name="twitter:image" content="{{ template.get('og_image', trans(template.meta_image)) }}">
 {% endblock %}
\ No newline at end of file