diff --git a/packages/twenty-front/src/modules/ui/input/editor/utils/getFirstNonEmptyLineOfRichText.ts b/packages/twenty-front/src/modules/ui/input/editor/utils/getFirstNonEmptyLineOfRichText.ts
index 475badcda..53ec8e6d6 100644
--- a/packages/twenty-front/src/modules/ui/input/editor/utils/getFirstNonEmptyLineOfRichText.ts
+++ b/packages/twenty-front/src/modules/ui/input/editor/utils/getFirstNonEmptyLineOfRichText.ts
@@ -9,15 +9,21 @@ export const getFirstNonEmptyLineOfRichText = (
   }
   for (const node of fieldValue) {
     if (!isUndefinedOrNull(node.content)) {
-      const contentArray = node.content as Array<{ text: string }>;
+      const contentArray = node.content as Array<
+        { text: string } | { link: string }
+      >;
       if (contentArray.length > 0) {
         for (const content of contentArray) {
-          if (content.text?.trim() !== '') {
-            return content.text;
+          if ('link' in content) {
+            return content.link;
+          }
+          if ('text' in content) {
+            return content.text.trim();
           }
         }
       }
     }
   }
+
   return '';
 };
diff --git a/packages/twenty-server/src/database/commands/upgrade-version/0-23/0-23-update-activities.command.ts b/packages/twenty-server/src/database/commands/upgrade-version/0-23/0-23-update-activities.command.ts
index 3b409e01c..115448c87 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version/0-23/0-23-update-activities.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version/0-23/0-23-update-activities.command.ts
@@ -165,11 +165,25 @@ export class UpdateActivitiesCommand extends CommandRunner {
 
           await timelineActivityRepository.update(
             {
+              name: 'note.created',
               linkedObjectMetadataId: activityObjectMetadataId,
               linkedRecordId: activity.id,
             },
             {
               linkedObjectMetadataId: noteObjectMetadataId,
+              name: 'linked-note.created',
+            },
+          );
+
+          await timelineActivityRepository.update(
+            {
+              name: 'note.updated',
+              linkedObjectMetadataId: activityObjectMetadataId,
+              linkedRecordId: activity.id,
+            },
+            {
+              linkedObjectMetadataId: noteObjectMetadataId,
+              name: 'linked-note.updated',
             },
           );
 
@@ -214,11 +228,25 @@ export class UpdateActivitiesCommand extends CommandRunner {
 
           await timelineActivityRepository.update(
             {
+              name: 'task.created',
               linkedObjectMetadataId: activityObjectMetadataId,
               linkedRecordId: activity.id,
             },
             {
               linkedObjectMetadataId: taskObjectMetadataId,
+              name: 'linked-task.created',
+            },
+          );
+
+          await timelineActivityRepository.update(
+            {
+              name: 'task.updated',
+              linkedObjectMetadataId: activityObjectMetadataId,
+              linkedRecordId: activity.id,
+            },
+            {
+              linkedObjectMetadataId: taskObjectMetadataId,
+              name: 'linked-task.updated',
             },
           );
           await attachmentRepository.update(