diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/UnplannedIssueNoteEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/UnplannedIssueNoteEventHandler.cs
index e756006f9..8ae10f026 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/UnplannedIssueNoteEventHandler.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/UnplannedIssueNoteEventHandler.cs
@@ -36,7 +36,11 @@ public class UnplannedIssueNoteEventHandler
     public virtual async Task HandleEventAsync(SfsCreatedEntityEventData<UnplannedIssueNote> eventData)
     {
         var entity = eventData.Entity;
-        await AddTransactionsAsync(entity).ConfigureAwait(false);
+
+        if (entity.Details.Count > 0)
+        {
+            await AddTransactionsAsync(entity).ConfigureAwait(false);
+        }
 
         if (!string.IsNullOrEmpty(entity.UnplannedIssueRequestNumber))
         {
@@ -63,8 +67,18 @@ public class UnplannedIssueNoteEventHandler
     public virtual async Task HandleEventAsync(SfsCreatedEntityEventData<List<UnplannedIssueNote>> eventData)
     {
         var entities = eventData.Entity;
-        await AddTransactionsAsync(entities).ConfigureAwait(false);
-        await RemoveExpectOut(entities).ConfigureAwait(false);
+        List<UnplannedIssueNote> notelist = new List<UnplannedIssueNote>();
+        foreach (var entity in entities)
+        {
+            if (entity.Details.Count > 0)
+            {
+                notelist.Add(entity);
+            }
+        }
+
+
+        await AddTransactionsAsync(notelist).ConfigureAwait(false);
+        await RemoveExpectOut(notelist).ConfigureAwait(false);
     }
 
     private async Task AddTransactionsAsync(List<UnplannedIssueNote> unplannedIssueNotes)
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/UnplannedReceiptNoteEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/UnplannedReceiptNoteEventHandler.cs
index 5e045a45f..cd3f69e1a 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/UnplannedReceiptNoteEventHandler.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/UnplannedReceiptNoteEventHandler.cs
@@ -30,8 +30,13 @@ public class UnplannedReceiptNoteEventHandler
     public virtual async Task HandleEventAsync(SfsCreatedEntityEventData<UnplannedReceiptNote> eventData)
     {
         var entity = eventData.Entity;
-        await AddTransactionsAsync(entity).ConfigureAwait(false);
 
+        if (entity.Details.Count > 0)
+        {
+            await AddTransactionsAsync(entity).ConfigureAwait(false);
+        }
+
+     
         //if (!string.IsNullOrEmpty(entity.UnplannedReceiptRequestNumber))
         //{
         //    await _unplannedReceiptRequestApp.CompleteByNumberAsync(entity.UnplannedReceiptRequestNumber).ConfigureAwait(false);
@@ -52,7 +57,16 @@ public class UnplannedReceiptNoteEventHandler
     public virtual async Task HandleEventAsync(SfsCreatedEntityEventData<List<UnplannedReceiptNote>> eventData)
     {
         var entities = eventData.Entity;
-        await AddTransactionsAsync(entities).ConfigureAwait(false);
+
+        List<UnplannedReceiptNote> notelist = new List<UnplannedReceiptNote>();
+        foreach (var entity in entities)
+        {
+            if (entity.Details.Count > 0)
+            {
+                notelist.Add(entity);
+            }
+        }
+        await AddTransactionsAsync(notelist).ConfigureAwait(false);
     }
 
     private async Task AddTransactionsAsync(List<UnplannedReceiptNote> unplannedReceiptNotes)