diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs
index 1d23fdbe..728ec06c 100644
--- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs
+++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs
@@ -160,6 +160,7 @@ public class ProductManagement : MonoBehaviour
         Observable.Merge(tankList.Select(tankView => tankView.TankClickObservable.Select(_ => tankView)))
             .Where(tankView => tankView.State.Value != TankState.Lock)
             .Where(tankView => tankView.State.Value != TankState.Unavailable)
+            .Where(tankView => gameData.StorageTanks[tankView.TankNumber - 1].Stock > 0)
             .Subscribe(tankView =>
             {
                 switch (state.Value)
@@ -172,10 +173,6 @@ public class ProductManagement : MonoBehaviour
                     case ManagementState.Replacing:
                         break;
                     case ManagementState.Tasting:
-                        if (gameData.StorageTanks[tankView.TankNumber - 1].Stock == 0)
-                        {
-                            return;
-                        }
                         ClearSelectedTank(tankList);
                         tankView.SetState(TankState.Selected);
                         var tankData = gameData.StorageTanks[tankView.TankNumber - 1];
@@ -190,6 +187,7 @@ public class ProductManagement : MonoBehaviour
         var replacingObservable = Observable.Merge(tankList.Select(x => x.TankClickObservable.Select(_ => x)))
             .Where(x => x.State.Value != TankState.Lock)
             .Where(x => x.State.Value != TankState.Unavailable)
+            .Where(tankView => gameData.StorageTanks[tankView.TankNumber - 1].Stock > 0)
             .TakeWhile(_ => state.Value != ManagementState.Tasting)
             .Pairwise();
         // タンク入れ替え