diff --git a/VERSION b/VERSION
index b98d1d3..c8320dd 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-6.3.5
+6.3.6
diff --git a/play-life-backend/main.go b/play-life-backend/main.go
index 3a84c2c..dcd4345 100644
--- a/play-life-backend/main.go
+++ b/play-life-backend/main.go
@@ -9436,6 +9436,20 @@ func (a *App) saveTaskDraftHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	// Если авто-выполнение включено и progression_value не задан — подставляем progression_base задачи
+	if req.AutoComplete != nil && *req.AutoComplete && req.ProgressionValue == nil &&
+		(req.ClearProgressionValue == nil || !*req.ClearProgressionValue) {
+		var taskProgressionBase sql.NullFloat64
+		if pbErr := a.DB.QueryRow("SELECT progression_base FROM tasks WHERE id = $1", taskID).Scan(&taskProgressionBase); pbErr != nil {
+			log.Printf("Error fetching task progression_base: %v", pbErr)
+			sendErrorWithCORS(w, fmt.Sprintf("Error fetching task progression_base: %v", pbErr), http.StatusInternalServerError)
+			return
+		}
+		if taskProgressionBase.Valid {
+			req.ProgressionValue = &taskProgressionBase.Float64
+		}
+	}
+
 	// Начинаем транзакцию
 	tx, err := a.DB.Begin()
 	if err != nil {
diff --git a/play-life-web/package.json b/play-life-web/package.json
index 00e8ad9..70af473 100644
--- a/play-life-web/package.json
+++ b/play-life-web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "play-life-web",
-  "version": "6.3.5",
+  "version": "6.3.6",
   "type": "module",
   "scripts": {
     "dev": "vite",