diff --git a/timeline_v2.go b/timeline_v2.go
index 5dbfb8a..d6fc82e 100644
--- a/timeline_v2.go
+++ b/timeline_v2.go
@@ -56,7 +56,8 @@ func (result *result) parse() *Tweet {
 	if result.QuotedStatusResult.Result != nil {
 		tw.QuotedStatus = result.QuotedStatusResult.Result.parse()
 	}
-	tw.HTML = expandMediaURLs(tw.HTML, legacy.ExtendedEntities.Media)
+	tw.HTML = expandURLs(tw.HTML, legacy.Entities.URLs, legacy.ExtendedEntities.Media)
+	tw.HTML = expandURLs(tw.Text, legacy.Entities.URLs, legacy.ExtendedEntities.Media)
 	return tw
 }
 
diff --git a/util.go b/util.go
index f6f74f5..abce237 100644
--- a/util.go
+++ b/util.go
@@ -157,7 +157,7 @@ func parseLegacyTweet(user *legacyUser, tweet *legacyTweet) *Tweet {
 	if tweetID == "" {
 		return nil
 	}
-	text := expandURLs(tweet.FullText, tweet.Entities.URLs)
+	text := expandURLs(tweet.FullText, tweet.Entities.URLs, tweet.ExtendedEntities.Media)
 	username := user.ScreenName
 	name := user.Name
 	tw := &Tweet{
@@ -380,25 +380,21 @@ func parseProfile(user legacyUser) Profile {
 	return profile
 }
 
-func expandURLs(text string, urls []Url) string {
+func expandURLs(text string, urls []Url, extendedMediaEntities []ExtendedMedia) string {
 	expandedText := text
 	for _, url := range urls {
 		expandedText = strings.ReplaceAll(expandedText, url.URL, url.ExpandedURL)
 	}
-	return expandedText
-}
-
-func expandMediaURLs(text string, extendedMediaEntities []ExtendedMedia) string {
-	expandedText := text
 	for _, entity := range extendedMediaEntities {
 		expandedText = strings.ReplaceAll(expandedText, entity.URL, entity.MediaURLHttps)
 	}
+
 	return expandedText
 }
 
 func parseProfileV2(user userResult) Profile {
 	u := user.Legacy
-	description := expandURLs(u.Description, u.Entities.Description.Urls)
+	description := expandURLs(u.Description, u.Entities.Description.Urls, []ExtendedMedia{})
 	profile := Profile{
 		Avatar:         u.ProfileImageURLHTTPS,
 		Banner:         u.ProfileBannerURL,