diff --git a/app/post_metadata.go b/app/post_metadata.go
index bd6384d9d4..aabec5504b 100644
--- a/app/post_metadata.go
+++ b/app/post_metadata.go
@@ -422,12 +422,6 @@ func (a *App) getLinkMetadata(requestURL string, timestamp int64, isNewPost bool
 
 		client := a.HTTPService().MakeClient(false)
 		client.Timeout = time.Duration(*a.Config().ExperimentalSettings.LinkMetadataTimeoutMilliseconds) * time.Millisecond
-		mmTransport := a.HTTPService().MakeTransport(false)
-		client.Transport = mmTransport.Transport
-
-		if strings.HasPrefix(requestURL, "https://twitter.com/") || strings.HasPrefix(requestURL, "https://mobile.twitter.com/") {
-			request.Header.Add("User-Agent", "facebookexternalhit/1.1 (+http://www.facebook.com/externalhit_uatext.php)")
-		}
 
 		var res *http.Response
 		res, err = client.Do(request)
diff --git a/services/httpservice/client.go b/services/httpservice/client.go
index d24550e74f..5cd08d2b1f 100644
--- a/services/httpservice/client.go
+++ b/services/httpservice/client.go
@@ -10,8 +10,6 @@ import (
 	"net"
 	"net/http"
 	"time"
-
-	"github.com/mattermost/mattermost-server/v5/model"
 )
 
 const (
@@ -86,7 +84,7 @@ func init() {
 		}
 		reservedIPRanges = append(reservedIPRanges, parsed)
 	}
-	defaultUserAgent = "mattermost-" + model.CurrentVersion
+	defaultUserAgent = "Mattermost-Bot/1.1"
 }
 
 type DialContextFunction func(ctx context.Context, network, addr string) (net.Conn, error)