diff --git a/src/component-library/components/Avatar/Avatar.tsx b/src/component-library/components/Avatar/Avatar.tsx
index 1cbac187..1d492c0b 100644
--- a/src/component-library/components/Avatar/Avatar.tsx
+++ b/src/component-library/components/Avatar/Avatar.tsx
@@ -30,7 +30,7 @@ export const Avatar = ({ url, isLoading, address }: AvatarProps) => {
       <>
         <img
           data-testid="avatar"
-          className="w-[40px] h-[40px] rounded-full"
+          className="min-w-[40px] max-w-[40px] h-[40px] rounded-full"
           src={url}
           alt={address}
         />
diff --git a/src/controllers/MessageContentController.tsx b/src/controllers/MessageContentController.tsx
index a40caf56..44a031cb 100644
--- a/src/controllers/MessageContentController.tsx
+++ b/src/controllers/MessageContentController.tsx
@@ -32,7 +32,7 @@ const MessageContentController = ({
         escapeHtml
         onClick={(event: MouseEvent<HTMLDivElement>) => event.stopPropagation()}
         matchers={[
-          new UrlMatcher("url", { validateTLD: false }),
+          new UrlMatcher("url"),
           new EmojiMatcher("emoji", {
             convertEmoticon: true,
             convertShortcode: true,