diff --git a/.eslintrc b/.eslintrc
index 0d89a03..929dc3c 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,5 +1,5 @@
 {
   "parser": "@typescript-eslint/parser",
   "plugins": ["@typescript-eslint"],
-  "extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended", "prettier", "prettier/@typescript-eslint"]
+  "extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended", "prettier"]
 }
\ No newline at end of file
diff --git a/subgraphs/stakewise/src/entities/rewardEthToken.ts b/subgraphs/stakewise/src/entities/rewardEthToken.ts
index f860615..6bf15e0 100644
--- a/subgraphs/stakewise/src/entities/rewardEthToken.ts
+++ b/subgraphs/stakewise/src/entities/rewardEthToken.ts
@@ -35,8 +35,12 @@ export function createStakingRewardsSnapshot(
 
   let periodDuration = BIG_INT_ZERO;
   let submitDuration = block.timestamp.minus(lastUpdateTimestamp);
-  while (periodDuration.plus(ORACLES_UPDATE_PERIOD).lt(submitDuration)) {
-    periodDuration = periodDuration.plus(ORACLES_UPDATE_PERIOD);
+  if (submitDuration.le(ORACLES_UPDATE_PERIOD)) {
+    periodDuration = submitDuration
+  } else {
+    while (periodDuration.plus(ORACLES_UPDATE_PERIOD).lt(submitDuration)) {
+      periodDuration = periodDuration.plus(ORACLES_UPDATE_PERIOD);
+    }
   }
 
   snapshot.periodTotalRewards = periodTotalRewards;
diff --git a/tsconfig.json b/tsconfig.json
index bed7635..876da8f 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,7 +1,6 @@
 {
+  "extends": "@graphprotocol/graph-ts/tsconfig",
   "compilerOptions": {
-    "strict": true,
-    "target": "es5",
-    "moduleResolution": "node"
+    "types": ["@graphprotocol/graph-ts"]
   }
 }