diff --git a/pkg/cleaning/stage_manager/manager.go b/pkg/cleaning/stage_manager/manager.go
index a47bdcfe76..839b264139 100644
--- a/pkg/cleaning/stage_manager/manager.go
+++ b/pkg/cleaning/stage_manager/manager.go
@@ -148,6 +148,10 @@ func GetCustomTagsMetadata(ctx context.Context, storageManager manager.StorageMa
 	var mutex sync.Mutex
 	stageIDCustomTagList = make(map[string][]string)
 	err = storageManager.ForEachGetStageCustomTagMetadata(ctx, stageCustomTagMetadataIDs, func(ctx context.Context, metadataID string, metadata *storage.CustomTagMetadata, err error) error {
+		if err != nil {
+			return err
+		}
+
 		mutex.Lock()
 		defer mutex.Unlock()