diff --git a/Assets/PerfectWorld/Scripts/UI/Dialogs/DlgProduce.cs b/Assets/PerfectWorld/Scripts/UI/Dialogs/DlgProduce.cs
index aea4b1e89c..163502e67d 100644
--- a/Assets/PerfectWorld/Scripts/UI/Dialogs/DlgProduce.cs
+++ b/Assets/PerfectWorld/Scripts/UI/Dialogs/DlgProduce.cs
@@ -565,6 +565,7 @@ namespace BrewMonster
 
         public void CloseProduce()
         {
+            EC_Game.GetGameRun().GetUIManager().GetInGameUIMan().EndNPCService();
             isProducing = false;
             produceRemainCount = 0;
             
@@ -578,7 +579,6 @@ namespace BrewMonster
             ResetItemInfoPanel();
             HideItemInfo();
             currentQuantity = 1;
-            Debug.Log("[DlgProduce] Produce dialog closed");
         }
 
         // Called when production starts (NOTIFY_PRODUCE_START)
diff --git a/Assets/PerfectWorld/Scripts/UI/NPCShopUIManager.cs b/Assets/PerfectWorld/Scripts/UI/NPCShopUIManager.cs
index 79f7d4b49b..be9c8c3ebf 100644
--- a/Assets/PerfectWorld/Scripts/UI/NPCShopUIManager.cs
+++ b/Assets/PerfectWorld/Scripts/UI/NPCShopUIManager.cs
@@ -9,6 +9,7 @@ using TMPro;
 using PerfectWorld.Scripts.Shop;
 using BrewMonster;
 using BrewMonster.UI;
+using BrewMonster.Network;
 using static CSNetwork.Common.ExpTypes;
 using ModelRenderer.Scripts.Common;
 
@@ -458,6 +459,7 @@ public class NPCShopUIManager : AUIDialog
     
     public void CloseShop()
     {
+        EC_Game.GetGameRun().GetUIManager().GetInGameUIMan().EndNPCService();
         CloseDialogue();
         if (npcShopMainPanel != null)
             npcShopMainPanel.SetActive(false);