diff --git a/packages/core-utils/src/lock-expiration-calculator.ts b/packages/core-utils/src/lock-expiration-calculator.ts
index eea5deab51..7fd3f797c2 100644
--- a/packages/core-utils/src/lock-expiration-calculator.ts
+++ b/packages/core-utils/src/lock-expiration-calculator.ts
@@ -1,16 +1,8 @@
-import { app } from "@arkecosystem/core-container";
-import { State } from "@arkecosystem/core-interfaces";
 import { Enums, Interfaces } from "@arkecosystem/crypto";
 
-export const calculateLockExpirationStatus = (expiration: Interfaces.IHtlcExpiration): boolean => {
-    const lastBlock: Interfaces.IBlock = app
-        .resolvePlugin<State.IStateService>("state")
-        .getStore()
-        .getLastBlock();
-
-    return (
-        (expiration.type === Enums.HtlcLockExpirationType.EpochTimestamp &&
-            expiration.value <= lastBlock.data.timestamp) ||
-        (expiration.type === Enums.HtlcLockExpirationType.BlockHeight && expiration.value <= lastBlock.data.height)
-    );
-};
+export const calculateLockExpirationStatus = (
+    lastBlock: Interfaces.IBlock,
+    expiration: Interfaces.IHtlcExpiration,
+): boolean =>
+    (expiration.type === Enums.HtlcLockExpirationType.EpochTimestamp && expiration.value <= lastBlock.data.timestamp) ||
+    (expiration.type === Enums.HtlcLockExpirationType.BlockHeight && expiration.value <= lastBlock.data.height);