diff --git a/indexer/chart/Chart.yaml b/indexer/chart/Chart.yaml
index 4287e3b..550d4e3 100644
--- a/indexer/chart/Chart.yaml
+++ b/indexer/chart/Chart.yaml
@@ -2,4 +2,4 @@ name: tfchainindexer
 description: Helm Chart for the tfchain hydra indexer
 version: 2.4.0
 apiVersion: v2
-appVersion: "2.5.10"
+appVersion: "2.5.11"
diff --git a/package-lock.json b/package-lock.json
index 690a324..e46078d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "graphql_tfgrid",
-  "version": "2.5.7",
+  "version": "2.5.11",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "graphql_tfgrid",
-      "version": "2.5.7",
+      "version": "2.5.11",
       "license": "ISC",
       "dependencies": {
         "@subsquid/graphql-server": "^0.1.5",
diff --git a/package.json b/package.json
index 05605fe..d6072d9 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "graphql_tfgrid",
   "private": "true",
-  "version": "2.5.9",
+  "version": "2.5.11",
   "description": "GraphQL server and Substrate indexer. Generated with ♥ by Hydra-CLI",
   "author": "",
   "license": "ISC",
diff --git a/processor-chart/Chart.yaml b/processor-chart/Chart.yaml
index 3c3ac5b..5e4dff5 100644
--- a/processor-chart/Chart.yaml
+++ b/processor-chart/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v2
 name: tfchain-processor
 description: A chart for the tfchain graphql processor and query node
 version: 1.0.4
-appVersion: "2.5.10"
+appVersion: "2.5.11"
diff --git a/src/mappings/contracts.ts b/src/mappings/contracts.ts
index 3f0796c..f7745dc 100644
--- a/src/mappings/contracts.ts
+++ b/src/mappings/contracts.ts
@@ -351,28 +351,27 @@ export async function contractGracePeriodStarted(ctx: EventHandlerContext) {
     contractID = contractGracePeriodStartedEvent.asV105.contractId
   }
 
-  let savedContract
-  savedContract = await ctx.store.get(NodeContract, { where: { contractID } })
-
-  if (!savedContract) {
-    savedContract = await ctx.store.get(RentContract, { where: { contractID } })
-    if (!savedContract) {
-      savedContract = await ctx.store.get(NameContract, { where: { contractID } })
-      if (!savedContract) return
-      else {
-        savedContract.state = ContractState.GracePeriod
-        await ctx.store.save<NameContract>(savedContract)
-      }
-    } else {
-      savedContract.state = ContractState.GracePeriod
-      await ctx.store.save<RentContract>(savedContract)
-    }
-  } else {
-    savedContract.state = ContractState.GracePeriod
-    await ctx.store.save<NodeContract>(savedContract)
+  const savedNodeContract = await ctx.store.get(NodeContract, { where: { contractID } })
+  if (savedNodeContract) {
+    savedNodeContract.state = ContractState.GracePeriod
+    await ctx.store.save<NodeContract>(savedNodeContract)
+    return
+  }
+
+  const savedRentContract = await ctx.store.get(RentContract, { where: { contractID } })
+  if (savedRentContract) {
+    savedRentContract.state = ContractState.GracePeriod
+    await ctx.store.save<RentContract>(savedRentContract)
+    return
   }
-}
 
+  const savedNameContract = await ctx.store.get(NameContract, { where: { contractID } })
+  if (savedNameContract) {
+    savedNameContract.state = ContractState.GracePeriod
+    await ctx.store.save<NameContract>(savedNameContract)
+    return
+  }
+}
 
 export async function contractGracePeriodEnded(ctx: EventHandlerContext) {
   let contractID = BigInt(0)
@@ -384,24 +383,24 @@ export async function contractGracePeriodEnded(ctx: EventHandlerContext) {
     contractID = contractGracePeriodEnded.asV105.contractId
   }
 
-  let savedContract
-  savedContract = await ctx.store.get(NodeContract, { where: { contractID } })
-
-  if (!savedContract) {
-    savedContract = await ctx.store.get(RentContract, { where: { contractID } })
-    if (!savedContract) {
-      savedContract = await ctx.store.get(NameContract, { where: { contractID } })
-      if (!savedContract) return
-      else {
-        savedContract.state = ContractState.GracePeriod
-        await ctx.store.save<NameContract>(savedContract)
-      }
-    } else {
-      savedContract.state = ContractState.GracePeriod
-      await ctx.store.save<RentContract>(savedContract)
-    }
-  } else {
-    savedContract.state = ContractState.GracePeriod
-    await ctx.store.save<NodeContract>(savedContract)
+  const savedNodeContract = await ctx.store.get(NodeContract, { where: { contractID } })
+  if (savedNodeContract) {
+    savedNodeContract.state = ContractState.Created
+    await ctx.store.save<NodeContract>(savedNodeContract)
+    return
+  }
+
+  const savedRentContract = await ctx.store.get(RentContract, { where: { contractID } })
+  if (savedRentContract) {
+    savedRentContract.state = ContractState.Created
+    await ctx.store.save<RentContract>(savedRentContract)
+    return
+  }
+
+  const savedNameContract = await ctx.store.get(NameContract, { where: { contractID } })
+  if (savedNameContract) {
+    savedNameContract.state = ContractState.Created
+    await ctx.store.save<NameContract>(savedNameContract)
+    return
   }
 }