diff --git a/assets/templates/index.tmpl b/assets/templates/index.tmpl
index 26114f77a..f53763807 100644
--- a/assets/templates/index.tmpl
+++ b/assets/templates/index.tmpl
@@ -8,6 +8,7 @@
   <title>{{ .config.SiteTitle }}</title>
 
   <meta property="og:url" content="{{ .config.SiteUrl }}"/>
+  <meta property="og:type" content="website" />
   <meta property="og:title" content="{{ .config.SiteTitle }}{{if .config.SiteCaption}}: {{ .config.SiteCaption }}{{end}}"/>
   <meta property="og:image" content="{{ .config.SitePreview }}"/>
   <meta property="og:description" content="{{ .config.SiteDescription }}"/>
diff --git a/assets/templates/share.tmpl b/assets/templates/share.tmpl
index d1d9ae4fd..cecee074f 100644
--- a/assets/templates/share.tmpl
+++ b/assets/templates/share.tmpl
@@ -8,6 +8,7 @@
   <title>{{ .config.SiteTitle }}{{if .config.SiteCaption}}: {{ .config.SiteCaption }}{{end}}</title>
 
   <meta property="og:url" content="{{ .config.SiteUrl }}"/>
+  <meta property="og:type" content="website" />
   <meta property="og:title" content="{{ .config.SiteCaption }}"/>
   <meta property="og:image" content="{{ .config.SitePreview }}"/>
   <meta property="og:description" content="{{ .config.SiteDescription }}"/>
diff --git a/docker/demo/index.tmpl b/docker/demo/index.tmpl
index a8d6f5dfc..db8605080 100644
--- a/docker/demo/index.tmpl
+++ b/docker/demo/index.tmpl
@@ -8,6 +8,7 @@
   <title>{{ .config.SiteTitle }}</title>
 
   <meta property="og:url" content="{{ .config.SiteUrl }}"/>
+  <meta property="og:type" content="website" />
   <meta property="og:title" content="{{ .config.SiteTitle }}{{if .config.SiteCaption}}: {{ .config.SiteCaption }}{{end}}"/>
   <meta property="og:image" content="{{ .config.SitePreview }}"/>
   <meta property="og:description" content="{{ .config.SiteDescription }}"/>
diff --git a/internal/api/share.go b/internal/api/share.go
index 55e704ef5..cffe32de8 100644
--- a/internal/api/share.go
+++ b/internal/api/share.go
@@ -26,6 +26,7 @@ func Shares(router *gin.RouterGroup) {
 		}
 
 		clientConfig := conf.GuestConfig()
+		clientConfig.SiteUrl = fmt.Sprintf("%ss/%s", clientConfig.SiteUrl, shareToken)
 
 		c.HTML(http.StatusOK, "share.tmpl", gin.H{"config": clientConfig})
 	})
@@ -52,7 +53,8 @@ func Shares(router *gin.RouterGroup) {
 		}
 
 		clientConfig := conf.GuestConfig()
-		clientConfig.SitePreview = fmt.Sprintf("%ss/%s/%s/preview", clientConfig.SiteUrl, shareToken, uid)
+		clientConfig.SiteUrl = fmt.Sprintf("%ss/%s/%s", clientConfig.SiteUrl, shareToken, uid)
+		clientConfig.SitePreview = fmt.Sprintf("%s/preview", clientConfig.SiteUrl)
 
 		if a, err := query.AlbumByUID(uid); err == nil {
 			clientConfig.SiteCaption = a.AlbumTitle