diff --git a/src/mappings/utils/tokenUtils.ts b/src/mappings/utils/tokenUtils.ts
index 387ff48..810cfea 100644
--- a/src/mappings/utils/tokenUtils.ts
+++ b/src/mappings/utils/tokenUtils.ts
@@ -30,7 +30,7 @@ export function createToken(address: Address, isDatatoken: boolean): Token {
   token.createdTimestamp = 0
   token.block = 0
   token.tx = ''
-  token.eventIndex = 0
+  token.eventIndex = BigInt.zero()
   token.save()
   return token
 }
@@ -61,7 +61,7 @@ export function createNftToken(address: Address): Nft {
   token.tx = ''
   token.orderCount = BigInt.zero()
   token.hasMetadata = false
-  token.eventIndex = 0
+  token.eventIndex = BigInt.zero()
   token.save()
   addNft()
   return token
@@ -95,7 +95,7 @@ export function getNftTokenWithID(tokenId: string): Nft {
     nftToken.tx = ''
     nftToken.orderCount = BigInt.zero()
     nftToken.hasMetadata = false
-    nftToken.eventIndex = 0
+    nftToken.eventIndex = BigInt.zero()
     nftToken.save()
     addNft()
   }
diff --git a/src/mappings/utils/veUtils.ts b/src/mappings/utils/veUtils.ts
index c127cd2..3f84a5b 100644
--- a/src/mappings/utils/veUtils.ts
+++ b/src/mappings/utils/veUtils.ts
@@ -21,7 +21,7 @@ export function getveOCEAN(id: string): VeOCEAN {
     ve.unlockTime = BigInt.zero()
     ve.lockedAmount = BigDecimal.zero()
     ve.block = 0
-    ve.eventIndex = 0
+    ve.eventIndex = BigInt.zero()
     ve.save()
   }
 
@@ -138,7 +138,7 @@ export function getveDelegation(id: string): VeDelegation {
     veDelegation.receiver = ''
     veDelegation.delegator = ''
     veDelegation.block = 0
-    veDelegation.eventIndex = 0
+    veDelegation.eventIndex = BigInt.zero()
     veDelegation.save()
   }
   return veDelegation
@@ -157,7 +157,7 @@ export function getDeposit(id: string): VeDeposit {
     deposit.timestamp = BigInt.zero()
     deposit.tx = ''
     deposit.block = 0
-    deposit.eventIndex = 0
+    deposit.eventIndex = BigInt.zero()
     // do not save it
     // deposit.save()
   }