diff --git a/api/admin/exec.go b/api/admin/exec.go
index 7544798..8b556fc 100644
--- a/api/admin/exec.go
+++ b/api/admin/exec.go
@@ -8,6 +8,7 @@ import (
 	"github.com/gorilla/websocket"
 	"github.com/komari-monitor/komari/api"
 	"github.com/komari-monitor/komari/database/auditlog"
+	"github.com/komari-monitor/komari/database/models"
 	"github.com/komari-monitor/komari/database/tasks"
 	"github.com/komari-monitor/komari/utils"
 	"github.com/komari-monitor/komari/ws"
@@ -79,7 +80,7 @@ func Exec(c *gin.Context) {
 	})
 	if len(offlineClients) > 0 {
 		for _, uuid := range offlineClients {
-			tasks.SaveTaskResult(taskId, uuid, "Client offline!", -1, time.Now())
+			tasks.SaveTaskResult(taskId, uuid, "Client offline!", -1, models.FromTime(time.Now()))
 		}
 	}
 }
diff --git a/api/client/task.go b/api/client/task.go
index 9358916..c5d4812 100644
--- a/api/client/task.go
+++ b/api/client/task.go
@@ -1,10 +1,9 @@
 package client
 
 import (
-	"time"
-
 	"github.com/gin-gonic/gin"
 	"github.com/komari-monitor/komari/database/clients"
+	"github.com/komari-monitor/komari/database/models"
 	"github.com/komari-monitor/komari/database/tasks"
 )
 
@@ -19,7 +18,7 @@ func TaskResult(c *gin.Context) {
 		TaskId     string    `json:"task_id" binding:"required"`
 		Result     string    `json:"result" binding:"required"`
 		ExitCode   int       `json:"exit_code"`
-		FinishedAt time.Time `json:"finished_at" binding:"required"`
+		FinishedAt models.LocalTime `json:"finished_at" binding:"required"`
 	}
 	if err := c.ShouldBindJSON(&req); err != nil {
 		c.JSON(400, gin.H{"status": "error", "message": "Invalid request"})
diff --git a/database/tasks/tasks.go b/database/tasks/tasks.go
index 38e054c..ca1285d 100644
--- a/database/tasks/tasks.go
+++ b/database/tasks/tasks.go
@@ -83,7 +83,7 @@ func DeleteTaskByTaskId(taskId string) error {
 	return dbcore.GetDBInstance().Where("task_id = ?", taskId).Delete(&models.Task{}).Error
 }
 
-func SaveTaskResult(taskId, clientId, result string, exitCode int, timestamp time.Time) error {
+func SaveTaskResult(taskId, clientId, result string, exitCode int, timestamp models.LocalTime) error {
 	return dbcore.GetDBInstance().
 		Model(&models.TaskResult{}).
 		Where("task_id = ? AND client = ?", taskId, clientId).