diff --git a/internal/tui/components/chat/message.go b/internal/tui/components/chat/message.go
index 225e4c00..4c747fe3 100644
--- a/internal/tui/components/chat/message.go
+++ b/internal/tui/components/chat/message.go
@@ -100,7 +100,7 @@ func renderUserMessage(msg message.Message, isFocused bool, width int, position
 
 	// Add timestamp info
 	info := []string{}
-	timestamp := time.Unix(msg.CreatedAt, 0).Format("15:04:05")
+	timestamp := time.UnixMilli(msg.CreatedAt).Local().Format("02 Jan 2006 03:04 PM")
 	username, _ := config.GetUsername()
 	info = append(info, baseStyle.
 		Width(width-1).
@@ -148,7 +148,7 @@ func renderAssistantMessage(
 	baseStyle := styles.BaseStyle()
 
 	// Always add timestamp info
-	timestamp := time.Unix(msg.CreatedAt, 0).Format("15:04:05")
+	timestamp := time.UnixMilli(msg.CreatedAt).Local().Format("02 Jan 2006 03:04 PM")
 	modelName := "Assistant"
 	if msg.Model != "" {
 		modelName = models.SupportedModels[msg.Model].Name
diff --git a/internal/tui/components/logs/details.go b/internal/tui/components/logs/details.go
index 3b712fe1..ff545938 100644
--- a/internal/tui/components/logs/details.go
+++ b/internal/tui/components/logs/details.go
@@ -66,7 +66,7 @@ func (i *detailCmp) updateContent() {
 	levelStyle := getLevelStyle(i.currentLog.Level)
 
 	// Format timestamp
-	timeStr := time.Unix(i.currentLog.Timestamp, 0).Format(time.RFC3339)
+	timeStr := time.UnixMilli(i.currentLog.Timestamp).Format(time.RFC3339)
 
 	header := lipgloss.JoinHorizontal(
 		lipgloss.Center,
diff --git a/internal/tui/components/logs/table.go b/internal/tui/components/logs/table.go
index 4a9eb06a..1bec9c78 100644
--- a/internal/tui/components/logs/table.go
+++ b/internal/tui/components/logs/table.go
@@ -165,7 +165,7 @@ func (i *tableCmp) updateRows() {
 
 	for _, log := range i.logs {
 		// Format timestamp as time
-		timeStr := time.Unix(log.Timestamp, 0).Format("15:04:05")
+		timeStr := time.UnixMilli(log.Timestamp).Format("15:04:05")
 
 		// Include ID as hidden first column for selection
 		row := table.Row{