diff --git a/api/post.go b/api/post.go
index 4d1425c18c..d9531b09a6 100644
--- a/api/post.go
+++ b/api/post.go
@@ -444,6 +444,7 @@ func getOpenGraphMetadata(c *Context, w http.ResponseWriter, r *http.Request) {
 	ogJson, err := og.ToJSON()
 	if err != nil {
 		w.Write([]byte(`{"url": ""}`))
+		return
 	}
 	w.Write(ogJson)
 }
diff --git a/app/post.go b/app/post.go
index d7bc2cf710..82fc733b46 100644
--- a/app/post.go
+++ b/app/post.go
@@ -488,10 +488,10 @@ func GetOpenGraphMetadata(url string) *opengraph.OpenGraph {
 	og := opengraph.NewOpenGraph()
 
 	res, err := http.Get(url)
-	defer CloseBody(res)
 	if err != nil {
 		return og
 	}
+	defer CloseBody(res)
 
 	if err := og.ProcessHTML(res.Body); err != nil {
 		return og