diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs
index 80fb06c2..ef8f87b2 100644
--- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs
+++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs
@@ -155,7 +155,6 @@ public class ProductManagement : MonoBehaviour
             {
                 case ManagementState.None:
                     ChangeAllTankInteractable(tankList, true);
-                    ClearSelectedTank(tankList);
                     break;
                 case ManagementState.Replacing:
                     break;
@@ -245,6 +244,7 @@ public class ProductManagement : MonoBehaviour
                     tanks.Current.SetData(gameData.StorageTanks[tanks.Current.TankNumber - 1]);
                     GameDataManager.SaveGameData();
                 }
+                ClearSelectedTank(tankList);
                 state.Value = ManagementState.None;
             }).AddTo(this);
         
@@ -259,10 +259,6 @@ public class ProductManagement : MonoBehaviour
         // 商品補充タイプ切替
         view.RefillType.Subscribe(mode =>
         {
-            if (state.Value != ManagementState.Tasting)
-            {
-                state.Value = ManagementState.None;
-            }
             // 補充方法変更
             gameData.RefillMode = mode;
             GameDataManager.SaveGameData();