diff --git a/src/CMSMicroservice.WebApi/Services/UserOrderService.cs b/src/CMSMicroservice.WebApi/Services/UserOrderService.cs
index e8c9e53..c55abcc 100644
--- a/src/CMSMicroservice.WebApi/Services/UserOrderService.cs
+++ b/src/CMSMicroservice.WebApi/Services/UserOrderService.cs
@@ -358,6 +358,13 @@ public class UserOrderService : UserOrderContract.UserOrderContractBase
                 if (currentCycle != null)
                 {
                     currentCycle.MagicCompletedAt = DateTime.UtcNow;
+                    currentCycle.IsCurrentCycle = false;
+                }
+
+                // B6 fix: ریست PackagePurchaseMethod تا Guards G1-G3 خرید مجدد را مسدود نکنند
+                if (user != null)
+                {
+                    user.PackagePurchaseMethod = PackagePurchaseMethod.None;
                 }
             }
             else if (wallet.WalletMode == WalletMode.Normal