diff --git a/src/mappings/nfts/setMetadata.ts b/src/mappings/nfts/setMetadata.ts
index 1d33df16..72dfeff3 100644
--- a/src/mappings/nfts/setMetadata.ts
+++ b/src/mappings/nfts/setMetadata.ts
@@ -46,6 +46,8 @@ export async function handleMetadataSet(context: Context): Promise<void> {
     final.image = metadata?.image
     final.media = metadata?.animationUrl
 
+    await context.store.save(final)
+
     if (eventIsOnNFT) {
       const collection = await getOptional<CollectionEntity>(context.store, CollectionEntity, event.collectionId)
 
@@ -58,8 +60,6 @@ export async function handleMetadataSet(context: Context): Promise<void> {
       }
     }
 
-    await context.store.save(final)
-
     if (!event.sn && final.metadata) {
       await updateItemMetadataByCollection(context.store, event.collectionId)
     }
diff --git a/src/mappings/uniques/setMetadata.ts b/src/mappings/uniques/setMetadata.ts
index 765d7504..aa4103ac 100644
--- a/src/mappings/uniques/setMetadata.ts
+++ b/src/mappings/uniques/setMetadata.ts
@@ -45,6 +45,8 @@ export async function handleMetadataSet(context: Context): Promise<void> {
     final.image = metadata?.image
     final.media = metadata?.animationUrl
 
+    await context.store.save(final)
+
     if (eventIsOnNFT) {
       const collection = await getOptional<CollectionEntity>(context.store, CollectionEntity, event.collectionId)
 
@@ -57,8 +59,6 @@ export async function handleMetadataSet(context: Context): Promise<void> {
     }
   }
 
-  await context.store.save(final)
-
   if (!event.sn && final.metadata) {
     await updateItemMetadataByCollection(context.store, event.collectionId)
   }