diff --git a/internal/plugin/social/twitter.go b/internal/plugin/social/twitter.go
index d98eee6..f2c6cc9 100644
--- a/internal/plugin/social/twitter.go
+++ b/internal/plugin/social/twitter.go
@@ -54,17 +54,12 @@ func (p *TwitterExpander) OnMessage(msg *model.Message, config map[string]interf
 		// Parse the URL
 		parsedURL, err := url.Parse(link)
 		if err != nil {
-			// If parsing fails, just do the simple replacement
-			link = strings.Replace(link, "twitter.com", replacementDomain, 1)
-			link = strings.Replace(link, "x.com", replacementDomain, 1)
 			return link
 		}
 
 		// Change the host to the configured domain
-		if strings.Contains(parsedURL.Host, "twitter.com") {
-			parsedURL.Host = strings.Replace(parsedURL.Host, "twitter.com", replacementDomain, 1)
-		} else if strings.Contains(parsedURL.Host, "x.com") {
-			parsedURL.Host = strings.Replace(parsedURL.Host, "x.com", replacementDomain, 1)
+		if strings.Contains(parsedURL.Host, "twitter.com") || strings.Contains(parsedURL.Host, "x.com") {
+			parsedURL.Host = replacementDomain
 		}
 
 		// Remove query parameters