diff --git a/files/templates/default.html b/files/templates/default.html
index 0d4ff197a..b266188da 100644
--- a/files/templates/default.html
+++ b/files/templates/default.html
@@ -95,7 +95,7 @@
 	<meta property="og:title" content="{{SITE_NAME}}">
 	<meta property="og:site_name" content="{{SITE}}">
 	<meta property="og:image" content="{{asset_siteimg('site_preview.webp')}}">
-	<meta property="og:url" content="{{SITE_FULL}}{{request.full_path}}">
+	<meta property="og:url" content="{{request.full_path}}">
 	<meta property="og:description" name="description" content="{{SITE_NAME}} - {{DESCRIPTION}}">
 	<meta property="og:author" name="author" content="{{SITE_FULL}}">
 
@@ -105,7 +105,7 @@
 	<meta name="twitter:creator" content="{{SITE_FULL}}">
 	<meta name="twitter:description" content="{{SITE_NAME}} - {{DESCRIPTION}}">
 	<meta name="twitter:image" content="{{asset_siteimg('site_preview.webp')}}">
-	<meta name="twitter:url" content="{{SITE_FULL}}{{request.full_path}}">
+	<meta name="twitter:url" content="{{request.full_path}}">
 	{% endblock %}
 
 	<meta name="apple-mobile-web-app-capable" content="yes">
diff --git a/files/templates/home.html b/files/templates/home.html
index 7fb0ba863..24468a8b4 100644
--- a/files/templates/home.html
+++ b/files/templates/home.html
@@ -2,23 +2,34 @@
 
 {% if sub %}
 	{% block title %}
-	<title>{{SITE_NAME}}</title>
+		{% if sub.bannerurl %}
+			{% set preview = sub.bannerurl %}
+		{% elif sub.sidebarurl %}
+			{% set preview = sub.sidebarurl %}
+		{% else %}
+			{% set preview = sub.banner_url %}
+		{% endif %}
 
-	<meta property="og:type" content="article">
-	<meta property="og:title" content="/h/{{sub.name}}">
-	<meta property="og:site_name" content="{{SITE}}">
-	<meta property="og:image" content="{{sub.bannerurl}}">
-	<meta property="og:url" content="{{request.full_path}}">
-	<meta property="og:description" name="description" content="/h/{{sub.name}} - {{sub.sidebar}}">
-	<meta property="og:author" name="author" content="{{SITE_FULL}}">
+		<title>{{SITE_NAME}}</title>
+		
+		<meta property="og:type" content="article">
+		<meta property="og:title" content="/h/{{sub.name}}">
+		<meta property="og:site_name" content="{{SITE}}">
+		<meta property="og:image" content="{{preview}}">
+		<meta property="og:url" content="{{request.full_path}}">
+		<meta property="og:author" name="author" content="{{SITE_FULL}}">
 
-	<meta name="twitter:card" content="summary_large_image">
-	<meta name="twitter:site" content="{{SITE_FULL}}">
-	<meta name="twitter:title" content="/h/{{sub.name}}">
-	<meta name="twitter:creator" content="{{SITE_FULL}}">
-	<meta name="twitter:description" content="/h/{{sub.name}} - {{sub.sidebar}}">
-	<meta name="twitter:image" content="{{sub.bannerurl}}">
-	<meta name="twitter:url" content="{{request.full_path}}">
+		<meta name="twitter:card" content="summary_large_image">
+		<meta name="twitter:site" content="{{SITE_FULL}}">
+		<meta name="twitter:title" content="/h/{{sub.name}}">
+		<meta name="twitter:creator" content="{{SITE_FULL}}">
+		<meta name="twitter:image" content="{{preview}}">
+		<meta name="twitter:url" content="{{request.full_path}}">
+
+		{% if sub.sidebar %}
+			<meta property="og:description" name="description" content="{{sub.sidebar}}">
+			<meta name="twitter:description" content="{{sub.sidebar}}">
+		{% endif %}
 	{% endblock %}
 {% endif %}
 
diff --git a/files/templates/settings2.html b/files/templates/settings2.html
index d3a890051..2cfe9e9e4 100644
--- a/files/templates/settings2.html
+++ b/files/templates/settings2.html
@@ -18,7 +18,7 @@
 	<meta property="og:title" content="{{SITE_NAME}}">
 	<meta property="og:site_name" content="{{SITE}}">
 	<meta property="og:image" content="{{asset_siteimg('site_preview.webp')}}">
-	<meta property="og:url" content="{{SITE_FULL}}{{request.full_path}}">
+	<meta property="og:url" content="{{request.full_path}}">
 	<meta property="og:description" name="description" content="{{SITE_NAME}} - {{DESCRIPTION}}">
 	<meta property="og:author" name="author" content="{{SITE_FULL}}">
 
@@ -28,7 +28,7 @@
 	<meta name="twitter:creator" content="{{SITE_FULL}}">
 	<meta name="twitter:description" content="{{SITE_NAME}} - {{DESCRIPTION}}">
 	<meta name="twitter:image" content="{{asset_siteimg('site_preview.webp')}}">
-	<meta name="twitter:url" content="{{SITE_FULL}}{{request.full_path}}">
+	<meta name="twitter:url" content="{{request.full_path}}">