diff --git a/src/common/indexer/elastic/elastic.indexer.service.ts b/src/common/indexer/elastic/elastic.indexer.service.ts
index ad06426aa..27df07ebd 100644
--- a/src/common/indexer/elastic/elastic.indexer.service.ts
+++ b/src/common/indexer/elastic/elastic.indexer.service.ts
@@ -750,7 +750,7 @@ export class ElasticIndexerService implements IndexerInterface {
         'data.uris',
       ])
       .withMustExistCondition('identifier')
-      .withMustMultiShouldCondition([EsdtType.NonFungibleESDT, EsdtType.SemiFungibleESDT], type => QueryType.Match('type', type))
+      .withMustMultiShouldCondition([EsdtType.NonFungibleESDT, EsdtType.SemiFungibleESDT, EsdtType.MetaESDT], type => QueryType.Match('type', type))
       .withPagination({ from: 0, size: 10000 });
 
     return await this.elasticService.getScrollableList('tokens', 'identifier', query, action);
diff --git a/src/common/rabbitmq/rabbitmq.nft.handler.service.ts b/src/common/rabbitmq/rabbitmq.nft.handler.service.ts
index 66865fe0b..da30d1c38 100644
--- a/src/common/rabbitmq/rabbitmq.nft.handler.service.ts
+++ b/src/common/rabbitmq/rabbitmq.nft.handler.service.ts
@@ -104,9 +104,6 @@ export class RabbitMqNftHandlerService {
 
     const collectionIdentifier = identifier.split('-').slice(0, 2).join('-');
     const collectionType = await this.getCollectionType(collectionIdentifier);
-    if (collectionType === NftType.MetaESDT) {
-      return false;
-    }
 
     this.logger.log(`Detected 'ESDTNFTCreate' event for NFT with identifier '${identifier}' and collection type '${collectionType}'`);
 
diff --git a/src/endpoints/nfts/nft.service.ts b/src/endpoints/nfts/nft.service.ts
index f3703125d..edc5c568a 100644
--- a/src/endpoints/nfts/nft.service.ts
+++ b/src/endpoints/nfts/nft.service.ts
@@ -451,8 +451,6 @@ export class NftService {
           nft.decimals = collectionProperties.decimals;
           // @ts-ignore
           delete nft.royalties;
-          // @ts-ignore
-          delete nft.uris;
         }
       }
     }
diff --git a/src/queue.worker/nft.worker/nft.worker.service.ts b/src/queue.worker/nft.worker/nft.worker.service.ts
index dd91a622a..da5f2b23a 100644
--- a/src/queue.worker/nft.worker/nft.worker.service.ts
+++ b/src/queue.worker/nft.worker/nft.worker.service.ts
@@ -6,7 +6,6 @@ import { NftMetadataService } from "./queue/job-services/metadata/nft.metadata.s
 import { NftMediaService } from "./queue/job-services/media/nft.media.service";
 import { ClientProxy } from "@nestjs/microservices";
 import { NftMessage } from "./queue/entities/nft.message";
-import { NftType } from "src/endpoints/nfts/entities/nft.type";
 import { NftAssetService } from "./queue/job-services/assets/nft.asset.service";
 import { PersistenceService } from "src/common/persistence/persistence.service";
 import { ApiConfigService } from "src/common/api-config/api.config.service";
@@ -44,10 +43,6 @@ export class NftWorkerService {
   }
 
   async needsProcessing(nft: Nft, settings: ProcessNftSettings): Promise<boolean> {
-    if (nft.type === NftType.MetaESDT) {
-      return false;
-    }
-
     if (settings.forceRefreshMedia || settings.forceRefreshMetadata || settings.forceRefreshThumbnail) {
       return true;
     }
diff --git a/src/queue.worker/nft.worker/queue/job-services/media/nft.media.service.ts b/src/queue.worker/nft.worker/queue/job-services/media/nft.media.service.ts
index 66d3b0cf3..ca0b45692 100644
--- a/src/queue.worker/nft.worker/queue/job-services/media/nft.media.service.ts
+++ b/src/queue.worker/nft.worker/queue/job-services/media/nft.media.service.ts
@@ -8,7 +8,6 @@ import { PersistenceService } from "src/common/persistence/persistence.service";
 import { MediaMimeTypeEnum } from "src/endpoints/nfts/entities/media.mime.type";
 import { Nft } from "src/endpoints/nfts/entities/nft";
 import { NftMedia } from "src/endpoints/nfts/entities/nft.media";
-import { NftType } from "src/endpoints/nfts/entities/nft.type";
 import { TokenHelpers } from "src/utils/token.helpers";
 import { ClientProxy } from "@nestjs/microservices";
 import { OriginLogger } from "@multiversx/sdk-nestjs-common";
@@ -63,10 +62,6 @@ export class NftMediaService {
   }
 
   private async getMediaRaw(nft: Nft): Promise<NftMedia[] | null> {
-    if (nft.type === NftType.MetaESDT) {
-      return null;
-    }
-
     if (!nft.uris) {
       return null;
     }
diff --git a/src/queue.worker/nft.worker/queue/job-services/metadata/nft.metadata.service.ts b/src/queue.worker/nft.worker/queue/job-services/metadata/nft.metadata.service.ts
index 8ab83454b..804a716d5 100644
--- a/src/queue.worker/nft.worker/queue/job-services/metadata/nft.metadata.service.ts
+++ b/src/queue.worker/nft.worker/queue/job-services/metadata/nft.metadata.service.ts
@@ -65,7 +65,7 @@ export class NftMetadataService {
   }
 
   async getMetadataRaw(nft: Nft): Promise<any> {
-    if (!nft.attributes || nft.type === NftType.MetaESDT) {
+    if (!nft.attributes) {
       return null;
     }