diff --git a/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs b/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs
index 20bc2eea..824fc311 100644
--- a/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs
+++ b/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs
@@ -121,7 +121,7 @@ public class DebugOptionManager : MonoBehaviour
                 gameData.StorageTanks.Add(new StorageTank(){Capacity = Const.TankCapacity});
             }
             var flavor = gameData.StorageTanks[0].FlavorId;
-            if (flavor == -1)
+            if (flavor < 1)
             {
                 flavor = 1;
             }
diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs
index ab38c09f..49849851 100644
--- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs
+++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs
@@ -598,6 +598,11 @@ public class Market : SingletonMonoBehaviour<Market>
         {
             GameDataManager.GameData.ShopStock.RemoveRange(0, GameDataManager.GameData.ShopStock.Count - ShopStockCount);
         }
+
+        foreach (var stockData in GameDataManager.GameData.ShopStock.Where(stockData => stockData.FlavorId < 1))
+        {
+            stockData.FlavorId = 1;
+        }
     }
 
     public void SetGameData(GameData newGameData)