diff --git a/src/app/pages/rpc-get-addresses/components/get-addresses.layout.tsx b/src/app/pages/rpc-get-addresses/components/get-addresses.layout.tsx
index 55c328e133..6a40b30956 100644
--- a/src/app/pages/rpc-get-addresses/components/get-addresses.layout.tsx
+++ b/src/app/pages/rpc-get-addresses/components/get-addresses.layout.tsx
@@ -21,7 +21,7 @@ import { FaviconDisplayer } from '@app/components/favicon-displayer/favicon-disp
 interface GetAddressesLayoutProps {
   requester: string;
   switchAccount: ReactNode;
-  onBeforeAnimation(): void;
+  onBeforeAnimation?(): void;
   onUserApprovesGetAddresses(): void;
   onClickRequestedByLink(): void;
 }
@@ -45,7 +45,7 @@ export function GetAddressesLayout({
   });
 
   async function userApprovesGetAddresses() {
-    onBeforeAnimation();
+    onBeforeAnimation?.();
     const yPos = window.innerHeight / 2 - 100;
     const xPos = Math.min(window.innerWidth / 2, 320) - 84;
     await contentDisappears.start({
diff --git a/src/app/pages/rpc-get-addresses/rpc-get-addresses.tsx b/src/app/pages/rpc-get-addresses/rpc-get-addresses.tsx
index 0f8c032939..f3b899ca59 100644
--- a/src/app/pages/rpc-get-addresses/rpc-get-addresses.tsx
+++ b/src/app/pages/rpc-get-addresses/rpc-get-addresses.tsx
@@ -38,7 +38,6 @@ export function RpcGetAddresses() {
   return (
     <GetAddressesLayout
       requester={origin}
-      onBeforeAnimation={focusInitatingTab}
       onClickRequestedByLink={focusInitatingTab}
       switchAccount={
         <AccountListItemLayout