diff --git a/src/pages/ValidatorOnboarding/ContinueButton.tsx b/src/pages/ValidatorOnboarding/ContinueButton.tsx
index 2597c7e5..76c9aad3 100644
--- a/src/pages/ValidatorOnboarding/ContinueButton.tsx
+++ b/src/pages/ValidatorOnboarding/ContinueButton.tsx
@@ -1,11 +1,9 @@
 import { Stack, YStack } from 'tamagui'
 import { Button, InformationBox } from '@status-im/components'
 import { CloseCircleIcon } from '@status-im/icons'
-import { useDispatch, useSelector } from 'react-redux'
-import { useEffect } from 'react'
+import { useSelector } from 'react-redux'
 
 import { RootState } from '../../redux/store'
-import { setIsRightPhrase } from '../../redux/ValidatorOnboarding/KeyGeneration/slice'
 import LinkWithArrow from '../../components/General/LinkWithArrow'
 
 type ContinueButton = {
@@ -21,31 +19,29 @@ const ContinueButton = ({
   isConfirmPhraseStage,
   subStepValidatorSetup,
 }: ContinueButton) => {
-  const { isCopyPastedPhrase, isRightPhrase, words, validWords } = useSelector(
+  const { isCopyPastedPhrase, words, validWords } = useSelector(
     (state: RootState) => state.keyGeneration,
   )
   const { isWalletConnected } = useSelector((state: RootState) => state.deposit)
-  const dispatch = useDispatch()
 
-  useEffect(() => {
-    dispatch(setIsRightPhrase(words.every(word => word !== '')))
-  }, [words])
+  const isActivationValScreen = activeStep === 3 && subStepValidatorSetup === 3
 
   const isDisabled = () => {
     const isDepositWalletConnected = isWalletConnected === false && activeStep === 5
+    let isEmptyPhrase = false
+    let isNotValidWords = false
 
-    if (
-      (isConfirmPhraseStage && !isRightPhrase) ||
-      (isConfirmPhraseStage && validWords.some(w => w === false)) ||
-      isDepositWalletConnected
-    ) {
+    if (isConfirmPhraseStage) {
+      isEmptyPhrase = words.some(word => word === '')
+      isNotValidWords = validWords.every(word => word === false)
+    }
+
+    if (isEmptyPhrase || isNotValidWords || isDepositWalletConnected) {
       return true
     }
     return false
   }
 
-  const isActivationValScreen = activeStep === 3 && subStepValidatorSetup === 3
-
   return (
     <YStack style={{ width: '100%', alignItems: 'center', zIndex: 999, marginTop: '30px' }}>
       <Stack style={{ width: '100%' }}>