diff --git a/pkg/cmd/agent-task/capi/sessions.go b/pkg/cmd/agent-task/capi/sessions.go
index 3a74ef3d9..4b457d799 100644
--- a/pkg/cmd/agent-task/capi/sessions.go
+++ b/pkg/cmd/agent-task/capi/sessions.go
@@ -142,9 +142,17 @@ func (s *Session) ExportData(fields []string) map[string]interface{} {
 				data[f] = nil
 			}
 		case "createdAt":
-			data[f] = s.CreatedAt
+			if s.CreatedAt.IsZero() {
+				data[f] = nil
+			} else {
+				data[f] = s.CreatedAt
+			}
 		case "updatedAt":
-			data[f] = s.LastUpdatedAt
+			if s.LastUpdatedAt.IsZero() {
+				data[f] = nil
+			} else {
+				data[f] = s.LastUpdatedAt
+			}
 		case "completedAt":
 			if s.CompletedAt.IsZero() {
 				data[f] = nil