diff --git a/dcm4chee-arc-audit/src/main/java/org/dcm4chee/arc/audit/AuditServiceUtils.java b/dcm4chee-arc-audit/src/main/java/org/dcm4chee/arc/audit/AuditServiceUtils.java
index 29c847719..cb11fda0c 100644
--- a/dcm4chee-arc-audit/src/main/java/org/dcm4chee/arc/audit/AuditServiceUtils.java
+++ b/dcm4chee-arc-audit/src/main/java/org/dcm4chee/arc/audit/AuditServiceUtils.java
@@ -165,7 +165,7 @@ static EventType forQuery(QueryContext ctx) {
         static EventType forInstanceStored(StoreContext ctx) {
             return !ctx.getLocations().isEmpty()
                     ? ctx.getPreviousInstance() != null ? STORE_UPDT : STORE_CREA
-                    : null;
+                    : ctx.getStoredInstance() != null ? STORE_CREA : null;
         }
 
         static HashSet<EventType> forBeginTransfer(RetrieveContext ctx) {
diff --git a/dcm4chee-arc-audit/src/main/java/org/dcm4chee/arc/audit/AuditTriggerObserver.java b/dcm4chee-arc-audit/src/main/java/org/dcm4chee/arc/audit/AuditTriggerObserver.java
index 476af9a9e..913411d20 100644
--- a/dcm4chee-arc-audit/src/main/java/org/dcm4chee/arc/audit/AuditTriggerObserver.java
+++ b/dcm4chee-arc-audit/src/main/java/org/dcm4chee/arc/audit/AuditTriggerObserver.java
@@ -95,7 +95,7 @@ public void onStore(@Observes StoreContext ctx) {
         if (auditService.isAuditInstalled()) {
             if (ctx.getRejectionNote() != null)
                 auditService.spoolInstancesDeleted(ctx);
-            else if (!ctx.getLocations().isEmpty() || ctx.getException() != null)
+            else if (ctx.getStoredInstance() != null || ctx.getException() != null)
                 auditService.spoolInstanceStoredOrWadoRetrieve(ctx, null);
         }
     }