diff --git a/webapp/models/Hero.php b/webapp/models/Hero.php
index 0ad35835..18cddf0a 100644
--- a/webapp/models/Hero.php
+++ b/webapp/models/Hero.php
@@ -424,7 +424,7 @@ class Hero extends BaseModel {
             return true;
         }
         $locking = false;
-        $heroUniId = $heroDto['idx'];
+        $heroUniId = empty($heroDto['hero_uniid']) ? $heroDto['hero_uniid'] : $heroDto['idx'];
         {
             $idx = 0;
             for ($i = 0; $i < kMaxHeroUpQualityNum; ++$i) {
diff --git a/webapp/services/BattleDataService.php b/webapp/services/BattleDataService.php
index 95edd451..2ea6669d 100644
--- a/webapp/services/BattleDataService.php
+++ b/webapp/services/BattleDataService.php
@@ -47,6 +47,9 @@ class BattleDataService extends BaseService {
             return false;
         }
         $heroDb = Hero::toDto($row);
+        if (Hero::heroIsLocking($heroDb)) {
+            return false;
+        }
         error_log(json_encode($_REQUEST));
         error_log('updateBattleData1');
         /*if (!$this->decCost($heroDb)) {