diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/UnplannedReceiptNoteEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/UnplannedReceiptNoteEventHandler.cs
index edfe2404e..20a98b8a6 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/UnplannedReceiptNoteEventHandler.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/UnplannedReceiptNoteEventHandler.cs
@@ -21,14 +21,23 @@ public class UnplannedReceiptNoteEventHandler
     public virtual async Task HandleEventAsync(SfsCreatedEntityEventData<UnplannedReceiptNote> eventData)
     {
         var entity = eventData.Entity;
-        await AddExchangeDataAsync(entity).ConfigureAwait(false);
+        if (entity.Details != null && entity.Details.Count > 0)
+        {
+            await AddExchangeDataAsync(entity).ConfigureAwait(false);
+        }
     }
 
     [UnitOfWork]
     public virtual async Task HandleEventAsync(SfsCreatedEntityEventData<List<UnplannedReceiptNote>> eventData)
     {
-        var entity = eventData.Entity;
-        await AddExchangeDataAsync(entity).ConfigureAwait(false);
+        var entities = eventData.Entity;
+        foreach (var entity in entities)
+        {
+            if (entity.Details != null && entity.Details.Count > 0)
+            {
+                await AddExchangeDataAsync(entity).ConfigureAwait(false);
+            }
+        }
     }
 
     protected override async Task AddExchangeDataAsync(List<UnplannedReceiptNote> entities)