diff --git a/components/form.js b/components/form.js
index ea8c9996..1d9e150d 100644
--- a/components/form.js
+++ b/components/form.js
@@ -1350,21 +1350,11 @@ function PasswordScanner ({ onScan, text }) {
     loading: () => <PageLoading />
   })
 
-  const closeRef = useRef()
-  useEffect(() => {
-    return () => {
-      // close modal on remount to avoid calling stale callbacks
-      // see https://github.com/stackernews/stacker.news/pull/2313
-      closeRef.current?.()
-    }
-  }, [])
-
   return (
     <InputGroup.Text
       style={{ cursor: 'pointer' }}
       onClick={() => {
         showModal(onClose => {
-          closeRef.current = onClose
           return (
             <div>
               {text && <h5 className='line-height-md mb-4 text-center'>{text}</h5>}
diff --git a/pages/wallets/index.js b/pages/wallets/index.js
index 278a1fd9..c36bbaf6 100644
--- a/pages/wallets/index.js
+++ b/pages/wallets/index.js
@@ -49,7 +49,7 @@ export default function Wallet () {
       ? (
         <WalletLayout>
           <div className='py-5 d-flex flex-column align-items-center justify-content-center flex-grow-1 mx-auto' style={{ maxWidth: '500px' }}>
-            <PassphrasePrompt />
+            {PassphrasePrompt}
           </div>
         </WalletLayout>
         )
diff --git a/wallets/client/hooks/crypto.js b/wallets/client/hooks/crypto.js
index c01f033a..b4b5d164 100644
--- a/wallets/client/hooks/crypto.js
+++ b/wallets/client/hooks/crypto.js
@@ -238,42 +238,41 @@ export function usePassphrasePrompt () {
   const [showPassphrasePrompt, setShowPassphrasePrompt] = useState(false)
   const togglePassphrasePrompt = useCallback(() => setShowPassphrasePrompt(v => !v), [])
 
-  const Prompt = useMemo(() =>
-    () => (
-      <div>
-        <h4>Wallet decryption</h4>
-        <p className='line-height-md mt-3'>
-          Your wallets have been encrypted on another device. Enter your passphrase to use your wallets on this device.
-        </p>
-        <p className='line-height-md'>
-          {showPassphrase && 'You can find the button to reveal your passphrase above your wallets on the other device.'}
-        </p>
-        <p className='line-height-md'>
-          Press reset if you lost your passphrase.
-        </p>
-        <Form
-          schema={passphraseSchema({ hash, salt })}
-          initial={{ passphrase: '' }}
-          onSubmit={onSubmit}
-        >
-          <PasswordInput
-            label='passphrase'
-            name='passphrase'
-            placeholder=''
-            required
-            autoFocus
-            qr
-          />
-          <div className='mt-3'>
-            <div className='d-flex justify-content-between align-items-center'>
-              <Button className='me-auto' variant='danger' onClick={resetPassphrase}>reset</Button>
-              <Button className='me-3 text-muted nav-link fw-bold' variant='link' onClick={togglePassphrasePrompt}>cancel</Button>
-              <SubmitButton variant='primary'>save</SubmitButton>
-            </div>
+  const Prompt = useMemo(() => (
+    <div>
+      <h4>Wallet decryption</h4>
+      <p className='line-height-md mt-3'>
+        Your wallets have been encrypted on another device. Enter your passphrase to use your wallets on this device.
+      </p>
+      <p className='line-height-md'>
+        {showPassphrase && 'You can find the button to reveal your passphrase above your wallets on the other device.'}
+      </p>
+      <p className='line-height-md'>
+        Press reset if you lost your passphrase.
+      </p>
+      <Form
+        schema={passphraseSchema({ hash, salt })}
+        initial={{ passphrase: '' }}
+        onSubmit={onSubmit}
+      >
+        <PasswordInput
+          label='passphrase'
+          name='passphrase'
+          placeholder=''
+          required
+          autoFocus
+          qr
+        />
+        <div className='mt-3'>
+          <div className='d-flex justify-content-between align-items-center'>
+            <Button className='me-auto' variant='danger' onClick={resetPassphrase}>reset</Button>
+            <Button className='me-3 text-muted nav-link fw-bold' variant='link' onClick={togglePassphrasePrompt}>cancel</Button>
+            <SubmitButton variant='primary'>save</SubmitButton>
           </div>
-        </Form>
-      </div>
-    ), [showPassphrase, resetPassphrase, togglePassphrasePrompt, onSubmit, hash, salt])
+        </div>
+      </Form>
+    </div>
+  ), [showPassphrase, resetPassphrase, togglePassphrasePrompt, onSubmit, hash, salt])
 
   return useMemo(
     () => [showPassphrasePrompt, togglePassphrasePrompt, Prompt],