diff --git a/src/api/status.ts b/src/api/status.ts
index f72b3d9..6979d8c 100644
--- a/src/api/status.ts
+++ b/src/api/status.ts
@@ -47,7 +47,7 @@ const populateTweetProperties = async (
   /* Populating a lot of the basics */
   apiTweet.url = `${Constants.TWITTER_ROOT}/${apiUser.screen_name}/status/${tweet.rest_id}`;
   apiTweet.id = tweet.rest_id;
-  apiTweet.text = unescapeText(linkFixer(tweet, tweet.legacy.full_text || ''));
+  apiTweet.text = unescapeText(linkFixer(tweet.legacy.entities?.urls, tweet.legacy.full_text || ''));
   apiTweet.author = {
     id: apiUser.id,
     name: apiUser.name,
@@ -93,7 +93,7 @@ const populateTweetProperties = async (
       tweet.note_tweet?.note_tweet_results?.result?.entity_set.symbols;
 
     console.log('We meet the conditions to use new note tweets');
-    apiTweet.text = unescapeText(linkFixer(tweet, noteTweetText));
+    apiTweet.text = unescapeText(linkFixer(tweet.legacy.entities.urls, noteTweetText));
     apiTweet.is_note_tweet = true;
   } else {
     apiTweet.is_note_tweet = false;
@@ -186,7 +186,7 @@ const populateTweetProperties = async (
     const translateAPI = await translateTweet(tweet, conversation.guestToken || '', language);
     if (translateAPI !== null && translateAPI?.translation) {
       apiTweet.translation = {
-        text: unescapeText(linkFixer(tweet, translateAPI?.translation || '')),
+        text: unescapeText(linkFixer(tweet.legacy?.entities?.urls, translateAPI?.translation || '')),
         source_lang: translateAPI?.sourceLanguage || '',
         target_lang: translateAPI?.destinationLanguage || '',
         source_lang_en: translateAPI?.localizedSourceLanguage || ''
diff --git a/src/api/user.ts b/src/api/user.ts
index 9f3e811..45885eb 100644
--- a/src/api/user.ts
+++ b/src/api/user.ts
@@ -1,5 +1,6 @@
 import { Constants } from '../constants';
 import { fetchUser } from '../fetch';
+import { linkFixer } from '../helpers/linkFixer';
 
 export const convertToApiUser = (user: GraphQLUser): APIUser => {
   const apiUser = {} as APIUser;
@@ -12,7 +13,7 @@ export const convertToApiUser = (user: GraphQLUser): APIUser => {
   apiUser.tweets = user.legacy.statuses_count;
   apiUser.name = user.legacy.name;
   apiUser.screen_name = user.legacy.screen_name;
-  apiUser.description = user.legacy.description;
+  apiUser.description = linkFixer(user.legacy.entities?.description?.urls, user.legacy.description);
   apiUser.location = user.legacy.location;
   apiUser.banner_url = user.legacy.profile_banner_url;
   /*
diff --git a/src/helpers/linkFixer.ts b/src/helpers/linkFixer.ts
index 2dd5c31..b9c594f 100644
--- a/src/helpers/linkFixer.ts
+++ b/src/helpers/linkFixer.ts
@@ -1,10 +1,10 @@
 /* Helps replace t.co links with their originals */
-export const linkFixer = (tweet: GraphQLTweet, text: string): string => {
+export const linkFixer = (entities: TcoExpansion[] | undefined, text: string): string => {
   // console.log('got entities', {
   //   entities: tweet.legacy.entities
   // });
-  if (Array.isArray(tweet.legacy.entities?.urls) && tweet.legacy.entities.urls.length) {
-    tweet.legacy.entities.urls.forEach((url: TcoExpansion) => {
+  if (Array.isArray(entities) && entities.length) {
+    entities.forEach((url: TcoExpansion) => {
       let newURL = url.expanded_url;
 
       if (newURL.match(/^https:\/\/twitter\.com\/i\/web\/status\/\w+/g) !== null) {
diff --git a/src/types/twitterTypes.d.ts b/src/types/twitterTypes.d.ts
index 186172f..394ff1a 100644
--- a/src/types/twitterTypes.d.ts
+++ b/src/types/twitterTypes.d.ts
@@ -232,12 +232,7 @@ type GraphQLUser = {
     description: string; // "What's happening?!",
     entities: {
       description?: {
-        urls?: {
-          display_url: string; // "about.twitter.com",
-          expanded_url: string; // "https://about.twitter.com/",
-          url: string; // "https://t.co/DAtOo6uuHk",
-          indices: [0, 23];
-        }[];
+        urls?: TcoExpansion[];
       };
       url?: {
         urls?: {