diff --git a/src/endpoints/mex/entities/mex.settings.ts b/src/endpoints/mex/entities/mex.settings.ts
index 28dd58bcf..f7e730772 100644
--- a/src/endpoints/mex/entities/mex.settings.ts
+++ b/src/endpoints/mex/entities/mex.settings.ts
@@ -23,7 +23,7 @@ export class MexSettings {
       ...response.proxy.map((x: any) => x.address),
     ];
     settings.pairContracts = [
-      ...response.pairs.filter((x: any) => x.state === 'Active').map((x: any) => x.address),
+      ...response.pairs.map((x: any) => x.address),
       ...response.proxy.map((x: any) => x.address),
     ];
     settings.wrapContracts = response.wrappingInfo.map((x: any) => x.address);
@@ -39,11 +39,11 @@ export class MexSettings {
     settings.lockedAssetIdentifier = lockedAssetIdentifiers.find((identifier: string) => identifier.startsWith('LKMEX'));
     settings.lockedAssetIdentifierV2 = lockedAssetIdentifiers.find((identifier: string) => identifier.startsWith('XMEX'));
 
-    const mexEgldPairs = response.pairs.filter((x: any) => x.firstToken.name === 'WrappedEGLD' && x.secondToken.name === 'MEX');
-    if (mexEgldPairs.length > 0) {
-      settings.wegldId = mexEgldPairs[0].firstToken.identifier;
-      settings.mexId = mexEgldPairs[0].secondToken.identifier;
-    }
+    const wrappedToken = response.wrappingInfo[0].wrappedToken.identifier;
+    const mexToken = response.simpleLockEnergy.baseAssetToken.identifier;
+
+    settings.wegldId = wrappedToken;
+    settings.mexId = mexToken;
 
     return settings;
   }
diff --git a/src/endpoints/mex/mex.settings.service.ts b/src/endpoints/mex/mex.settings.service.ts
index 2770ef3f8..52d08795f 100644
--- a/src/endpoints/mex/mex.settings.service.ts
+++ b/src/endpoints/mex/mex.settings.service.ts
@@ -92,23 +92,12 @@ export class MexSettingsService {
       limit: 500,
     };
 
+
+
     const query = gql`
     query ($offset: Int, $limit: Int) {
-      pairs(offset: $offset, limit: $limit) {
-        state
+      pairs(offset: $offset, limit: $limit, state: "Active") {
         address
-        firstToken {
-          name
-          identifier
-          decimals
-          __typename
-        }
-        secondToken {
-          name
-          identifier
-          decimals
-          __typename
-        } 
       }
       proxy {
         address
@@ -134,6 +123,9 @@ export class MexSettingsService {
       wrappingInfo {
         address
         shard
+        wrappedToken {
+          identifier
+        }
       }
       distribution {
         address
@@ -151,6 +143,11 @@ export class MexSettingsService {
       factory {
         address
       }
+      simpleLockEnergy {
+        baseAssetToken {
+          identifier
+        }
+      }
     }
     `;