diff --git a/src/components/Notes/Note.tsx b/src/components/Notes/Note.tsx
index eb0ced3..16f709e 100644
--- a/src/components/Notes/Note.tsx
+++ b/src/components/Notes/Note.tsx
@@ -109,8 +109,6 @@ export const Note = ({ ndkEvent }: NoteProps) => {
 
   const baseUrl = appRoutes.feed + '/'
 
-  // Did user already repost this
-
   // Show who reposted the note
   const reposterVisual =
     repostEvent && reposterRoute ? (
@@ -178,12 +176,18 @@ export const Note = ({ ndkEvent }: NoteProps) => {
             </div>
             {noteEvent.created_at && (
               <div className='IBMSMSMBSSCL_CommentActionsDetails'>
-                <a className='IBMSMSMBSSCL_CADTime'>
+                <Link
+                  to={baseUrl + noteEvent.encode()}
+                  className='IBMSMSMBSSCL_CADTime'
+                >
                   {formatDate(noteEvent.created_at * 1000, 'hh:mm aa')}{' '}
-                </a>
-                <a className='IBMSMSMBSSCL_CADDate'>
+                </Link>
+                <Link
+                  to={baseUrl + noteEvent.encode()}
+                  className='IBMSMSMBSSCL_CADDate'
+                >
                   {formatDate(noteEvent.created_at * 1000, 'dd/MM/yyyy')}
-                </a>
+                </Link>
               </div>
             )}
           </div>
diff --git a/src/components/Notes/internal/NoteWrapper.tsx b/src/components/Notes/internal/NoteWrapper.tsx
index b8c9e74..13a704a 100644
--- a/src/components/Notes/internal/NoteWrapper.tsx
+++ b/src/components/Notes/internal/NoteWrapper.tsx
@@ -32,6 +32,8 @@ export const NoteWrapper = ({ noteEntity }: NoteWrapperProps) => {
 
   if (!note) return <Dots />
 
+  const baseUrl = appRoutes.feed + '/'
+
   return (
     <div className='IBMSMSMBSSCL_CommentQP'>
       <div className='IBMSMSMBSSCL_Comment'>
@@ -58,12 +60,18 @@ export const NoteWrapper = ({ noteEntity }: NoteWrapperProps) => {
             </div>
             {note.created_at && (
               <div className='IBMSMSMBSSCL_CommentActionsDetails'>
-                <a className='IBMSMSMBSSCL_CADTime'>
+                <Link
+                  to={baseUrl + noteEntity}
+                  className='IBMSMSMBSSCL_CADTime'
+                >
                   {formatDate(note.created_at * 1000, 'hh:mm aa')}{' '}
-                </a>
-                <a className='IBMSMSMBSSCL_CADDate'>
+                </Link>
+                <Link
+                  to={baseUrl + noteEntity}
+                  className='IBMSMSMBSSCL_CADDate'
+                >
                   {formatDate(note.created_at * 1000, 'dd/MM/yyyy')}
-                </a>
+                </Link>
               </div>
             )}
           </div>