diff --git a/src/main/groovy/io/seqera/wave/service/scan/ContainerScanServiceImpl.groovy b/src/main/groovy/io/seqera/wave/service/scan/ContainerScanServiceImpl.groovy
index 62b089c3b..b328d271d 100644
--- a/src/main/groovy/io/seqera/wave/service/scan/ContainerScanServiceImpl.groovy
+++ b/src/main/groovy/io/seqera/wave/service/scan/ContainerScanServiceImpl.groovy
@@ -136,12 +136,12 @@ class ContainerScanServiceImpl implements ContainerScanService, JobHandler<ScanE
                 log.debug "Container scan required by scanOnRequest=$request"
                 scan(fromContainer(request))
             }
-            else if( request.scanId && !request.isContainer() && request.buildNew==false && !request.dryRun && !existsScan(request.scanId) ) {
+            else if( request.scanId && !request.isContainer() && request.buildNew==false && request.succeeded && !request.dryRun && !existsScan(request.scanId) ) {
                 log.debug "Container scan required by cached request=$request"
                 scan(fromContainer(request))
             }
             else {
-                log.debug "Container scan NOT required by scanOnRequest=$request"
+                log.debug "Container scan NOT required by request=$request"
             }
         }
         catch (Exception e) {
diff --git a/src/test/groovy/io/seqera/wave/service/scan/ContainerScanServiceImplTest.groovy b/src/test/groovy/io/seqera/wave/service/scan/ContainerScanServiceImplTest.groovy
index 59d825dea..55ab72bbc 100644
--- a/src/test/groovy/io/seqera/wave/service/scan/ContainerScanServiceImplTest.groovy
+++ b/src/test/groovy/io/seqera/wave/service/scan/ContainerScanServiceImplTest.groovy
@@ -402,6 +402,7 @@ class ContainerScanServiceImplTest extends Specification {
         request.buildId >> BUILD_ID
         request.buildNew >> BUILD_NEW
         request.dryRun >> DRY_RUN
+        request.succeeded >> SUCCEEDED
         and:
         def scan = Mock(ScanRequest)
 
@@ -412,15 +413,16 @@ class ContainerScanServiceImplTest extends Specification {
         RUN_TIMES * scanService.scan(scan) >> null
 
         where:
-        SCAN_ID | BUILD_ID  | BUILD_NEW | DRY_RUN   | EXISTS_SCAN   | RUN_TIMES
-        null    | null      | null      | null      | false         | 0
-        'sc-123'| null      | null      | null      | false         | 0
+        SCAN_ID | BUILD_ID  | BUILD_NEW | SUCCEEDED | DRY_RUN | EXISTS_SCAN | RUN_TIMES
+        null    | null      | null      | null      | null      | false         | 0
+        'sc-123'| null      | null      | null      | null      | false         | 0
         and:
-        'sc-123'| 'bd-123'  | null      | null      | false         | 0
-        'sc-123'| 'bd-123'  | true      | null      | false         | 0
-        'sc-123'| 'bd-123'  | false     | null      | false         | 1
-        'sc-123'| 'bd-123'  | false     | null      | true          | 0
-        'sc-123'| 'bd-123'  | false     | true      | false         | 0
+        'sc-123'| 'bd-123'  | null      | null      | null      | false         | 0
+        'sc-123'| 'bd-123'  | true      | null      | null      | false         | 0
+        'sc-123'| 'bd-123'  | false     | true      | null      | false         | 1
+        'sc-123'| 'bd-123'  | false     | false     | null      | false         | 0
+        'sc-123'| 'bd-123'  | false     | null      | null      | true          | 0
+        'sc-123'| 'bd-123'  | false     | null      | true      | false         | 0
     }
 
     def 'should store scan entry' () {