diff --git a/internal/indexer/controller/checkmanifest.go b/internal/indexer/controller/checkmanifest.go
index 7e73f6e7b..9087f5787 100644
--- a/internal/indexer/controller/checkmanifest.go
+++ b/internal/indexer/controller/checkmanifest.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/quay/claircore/internal/indexer"
 	"github.com/rs/zerolog"
 )
 
@@ -22,7 +23,23 @@ func checkManifest(ctx context.Context, s *Controller) (State, error) {
 	// if we haven't seen this manifest transition persist it
 	// and transition to FetchLayer state.
 	if !ok {
-		log.Info().Msg("manifest to be scanned... persisting manifest.")
+		log.Info().Msg("manifest to be scanned...")
+
+		// if a manifest was analyzed by a particular scanner we can
+		// omit it from this index, as all its comprising layers were analyzed
+		// by the particular scanner as well.
+		filtered := make(indexer.VersionedScanners, 0, len(s.Vscnrs))
+		for i := range s.Vscnrs {
+			ok, err := s.Store.ManifestScanned(ctx, s.manifest.Hash, s.Vscnrs[i:i+1]) // slice this to avoid allocations
+			if err != nil {
+				return Terminal, err
+			}
+			if !ok {
+				filtered = append(filtered, s.Vscnrs[i])
+			}
+		}
+		s.Vscnrs = filtered
+
 		err := s.Store.PersistManifest(ctx, *s.manifest)
 		if err != nil {
 			return Terminal, fmt.Errorf("failed to persist manifest: %v", err)
diff --git a/internal/indexer/postgres/manifestscanned.go b/internal/indexer/postgres/manifestscanned.go
index ab5315d65..cecb60ab9 100644
--- a/internal/indexer/postgres/manifestscanned.go
+++ b/internal/indexer/postgres/manifestscanned.go
@@ -42,7 +42,7 @@ func manifestScanned(ctx context.Context, db *sqlx.DB, hash claircore.Digest, sc
 		expectedIDs = append(expectedIDs, id)
 	}
 
-	// get a map of the found ids which have scanned this package
+	// get a map of the found ids which have scanned this manifest
 	var temp = []int64{}
 	var foundIDs = map[int64]struct{}{}
 	err := db.Select(&temp, selectScanned, hash)