diff --git a/config/config.mainnet.yaml b/config/config.mainnet.yaml
index edc9c7a00..52b6cd891 100644
--- a/config/config.mainnet.yaml
+++ b/config/config.mainnet.yaml
@@ -63,8 +63,8 @@ features:
     cronExpression: '*/5 * * * * *'
     activationEpoch: 1391
   chainAndromeda:
-    enabled: false
-    activationEpoch: 4
+    enabled: true
+    activationEpoch: 1763
   nodeEpochsLeft:
     enabled: false
   transactionProcessor:
diff --git a/src/endpoints/blocks/block.service.ts b/src/endpoints/blocks/block.service.ts
index d352d5a19..d7ef41d71 100644
--- a/src/endpoints/blocks/block.service.ts
+++ b/src/endpoints/blocks/block.service.ts
@@ -64,6 +64,7 @@ export class BlockService {
     const nodeIdentities = await ConcurrencyUtils.executeWithConcurrencyLimit(
       relevantNodes,
       async (node) => {
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         const identity = await this.identitiesService.getIdentity(node.identity!);
         return { node, identity };
       },
diff --git a/src/endpoints/transactions/transaction.service.ts b/src/endpoints/transactions/transaction.service.ts
index 6167b1fbb..ae196d8df 100644
--- a/src/endpoints/transactions/transaction.service.ts
+++ b/src/endpoints/transactions/transaction.service.ts
@@ -477,7 +477,7 @@ export class TransactionService {
       if (!resultsByHash.has(txHash)) {
         resultsByHash.set(txHash, []);
       }
-      resultsByHash.get(txHash)!.push(result);
+      resultsByHash.get(txHash)?.push(result);
     }
 
     const results: Array<SmartContractResult[] | undefined> = [];