diff --git a/DysonNetwork.Pass/Startup/BroadcastEventHandler.cs b/DysonNetwork.Pass/Startup/BroadcastEventHandler.cs
index f6ed967..333ced1 100644
--- a/DysonNetwork.Pass/Startup/BroadcastEventHandler.cs
+++ b/DysonNetwork.Pass/Startup/BroadcastEventHandler.cs
@@ -13,7 +13,7 @@ public class BroadcastEventHandler(
 {
     protected override async Task ExecuteAsync(CancellationToken stoppingToken)
     {
-        await foreach (var msg in nats.SubscribeAsync<byte[]>(PaymentOrderEvent.Type, cancellationToken: stoppingToken))
+        await foreach (var msg in nats.SubscribeAsync<byte[]>(PaymentOrderEventBase.Type, cancellationToken: stoppingToken))
         {
             PaymentOrderEvent? evt = null;
             try
diff --git a/DysonNetwork.Pass/Wallet/SubscriptionService.cs b/DysonNetwork.Pass/Wallet/SubscriptionService.cs
index df3589f..8f5747e 100644
--- a/DysonNetwork.Pass/Wallet/SubscriptionService.cs
+++ b/DysonNetwork.Pass/Wallet/SubscriptionService.cs
@@ -259,7 +259,8 @@ public class SubscriptionService(
             null,
             subscriptionInfo.Currency,
             subscription.FinalPrice,
-            appIdentifier: SubscriptionOrderIdentifier,
+            appIdentifier: "internal",
+            productIdentifier: identifier,
             meta: new Dictionary<string, object>()
             {
                 ["subscription_id"] = subscription.Id.ToString(),
@@ -270,8 +271,7 @@ public class SubscriptionService(
 
     public async Task<Subscription> HandleSubscriptionOrder(Order order)
     {
-        if (order.AppIdentifier != SubscriptionOrderIdentifier || order.Status != OrderStatus.Paid ||
-            order.Meta?["subscription_id"] is not JsonElement subscriptionIdJson)
+        if (order.Status != OrderStatus.Paid || order.Meta?["subscription_id"] is not JsonElement subscriptionIdJson)
             throw new InvalidOperationException("Invalid order.");
 
         var subscriptionId = Guid.TryParse(subscriptionIdJson.ToString(), out var parsedSubscriptionId)