diff --git a/routers/api/actions/runner/runner.go b/routers/api/actions/runner/runner.go
index e079aa8de8..5a29dd7ab7 100644
--- a/routers/api/actions/runner/runner.go
+++ b/routers/api/actions/runner/runner.go
@@ -336,9 +336,21 @@ func (s *Service) UpdateLog(
 
 	res.Msg.AckIndex = task.LogLength
 
-	if err := actions_model.UpdateTask(ctx, task, "log_indexes", "log_length", "log_size"); err != nil {
+	var remove func()
+	if req.Msg.NoMore {
+		task.LogInStorage = true
+		remove, err = actions.TransferLogs(ctx, task.LogFilename)
+		if err != nil {
+			return nil, connect.NewError(connect.CodeInternal, fmt.Errorf("transfer logs: %w", err))
+		}
+	}
+
+	if err := actions_model.UpdateTask(ctx, task, "log_indexes", "log_length", "log_size", "log_in_storage"); err != nil {
 		return nil, connect.NewError(connect.CodeInternal, fmt.Errorf("update task: %w", err))
 	}
+	if remove != nil {
+		remove()
+	}
 
 	return res, nil
 }
diff --git a/services/actions/clear_tasks.go b/services/actions/clear_tasks.go
index d597ad313b..507659d085 100644
--- a/services/actions/clear_tasks.go
+++ b/services/actions/clear_tasks.go
@@ -10,6 +10,7 @@ import (
 
 	actions_model "forgejo.org/models/actions"
 	"forgejo.org/models/db"
+	"forgejo.org/modules/actions"
 	"forgejo.org/modules/log"
 	"forgejo.org/modules/optional"
 	"forgejo.org/modules/setting"
@@ -53,6 +54,18 @@ func stopTasks(ctx context.Context, opts actions_model.FindTaskOptions) error {
 			log.Warn("Cannot stop task %v: %v", task.ID, err)
 			continue
 		}
+
+		remove, err := actions.TransferLogs(ctx, task.LogFilename)
+		if err != nil {
+			log.Warn("Cannot transfer logs of task %v: %v", task.ID, err)
+			continue
+		}
+		task.LogInStorage = true
+		if err := actions_model.UpdateTask(ctx, task, "log_in_storage"); err != nil {
+			log.Warn("Cannot update task %v: %v", task.ID, err)
+			continue
+		}
+		remove()
 	}
 
 	CreateCommitStatus(ctx, jobs...)
diff --git a/services/actions/task.go b/services/actions/task.go
index 141678549c..4f78092bdb 100644
--- a/services/actions/task.go
+++ b/services/actions/task.go
@@ -263,7 +263,7 @@ func StopTask(ctx context.Context, taskID int64, status actions_model.Status) er
 		}
 	}
 
-	return TransferLogsAndUpdateLogInStorage(ctx, task)
+	return nil
 }
 
 // UpdateTaskByState updates the task by the state.
@@ -319,12 +319,6 @@ func UpdateTaskByState(ctx context.Context, runnerID int64, state *runnerv1.Task
 		}
 	}
 
-	if task.Status.IsDone() {
-		if err := TransferLogsAndUpdateLogInStorage(ctx, task); err != nil {
-			return nil, err
-		}
-	}
-
 	if err := task.LoadAttributes(ctx); err != nil {
 		return nil, err
 	}