diff --git a/webapp/models/ChipPage.php b/webapp/models/ChipPage.php
index debbb5b0..cfb06692 100644
--- a/webapp/models/ChipPage.php
+++ b/webapp/models/ChipPage.php
@@ -70,16 +70,18 @@ class ChipPage extends BaseModel
 
     public static function toDtoBattle($row){
         $data = emptyReplace(json_decode($row['data'], true), array());
-        foreach ($data as &$value){
-            $chipDb = Chip::find($value['chip_id']);
-            if ( !$chipDb ) {
-                $value['chip_id'] = 0;
-                Chip::updateInlayState($value['chip_id'],0);
+        if ($data){
+            foreach ($data as &$value){
+                $chipDb = Chip::find($value['chip_id']);
+                if ( !$chipDb ) {
+                    $value['chip_id'] = 0;
+                    Chip::updateInlayState($value['chip_id'],0);
+                }
             }
+            self::update($row['hero_uniid'],array(
+                'data' => json_encode($data)
+            ));
         }
-        self::update($row['hero_uniid'],array(
-            'data' => json_encode($data)
-        ));
         $newRow = self::find($row['hero_uniid']);
         $newData = emptyReplace(json_decode($newRow['data'], true), array());
         $attrs = array();