diff --git a/src/common/modals/compositions/ChangeLockModal.vue b/src/common/modals/compositions/ChangeLockModal.vue
index 8454f92..65bf14e 100644
--- a/src/common/modals/compositions/ChangeLockModal.vue
+++ b/src/common/modals/compositions/ChangeLockModal.vue
@@ -178,13 +178,14 @@ watch(
     form.lockPeriod,
     web3ProvidersStore.provider.selectedAddress,
     web3ProvidersStore.provider.chainId,
+    userPoolData.value?.claimLockEnd,
   ],
   () => fetchExpectedMultiplier(form.lockPeriod),
   { immediate: true },
 )
 
 watch(
-  () => props.isShown,
+  () => [props.isShown, userPoolData.value?.claimLockEnd],
   () => {
     form.lockPeriod = String(userPoolData.value?.claimLockEnd.toNumber() || '')
   },
diff --git a/src/forms/DepositForm.vue b/src/forms/DepositForm.vue
index a29f5fa..604e7a6 100644
--- a/src/forms/DepositForm.vue
+++ b/src/forms/DepositForm.vue
@@ -119,7 +119,6 @@ const emit = defineEmits<{
 const props = defineProps<{
   poolId: number
   minStake: BigNumber
-  lockEnd: string
 }>()
 
 const uid = uuidv4()
@@ -315,17 +314,17 @@ watch(
     web3ProvidersStore.erc1967ProxyContract.providerBased.value.address,
     web3ProvidersStore.provider.selectedAddress,
     form.lockPeriod,
+    userPoolData.value?.claimLockEnd,
   ],
   () => fetchExpectedMultiplier(form.lockPeriod),
   { immediate: true },
 )
 
 watch(
-  () => props.lockEnd,
+  () => userPoolData.value?.claimLockEnd,
   () => {
-    form.lockPeriod = props.lockEnd
+    form.lockPeriod = String(userPoolData.value?.claimLockEnd.toNumber() || '')
   },
-  { immediate: true },
 )
 
 onMounted(() => {