diff --git a/packages/extension-polkagate/src/popup/PhishingDetected.tsx b/packages/extension-polkagate/src/popup/PhishingDetected.tsx
index d06d4503e..056b0b7cd 100644
--- a/packages/extension-polkagate/src/popup/PhishingDetected.tsx
+++ b/packages/extension-polkagate/src/popup/PhishingDetected.tsx
@@ -12,7 +12,7 @@ interface WebsiteState {
   website: string;
 }
 
-export default function PhishingDetected(): React.ReactElement {
+export default function PhishingDetected (): React.ReactElement {
   const { t } = useTranslation();
   const { website } = useParams<WebsiteState>();
   const decodedWebsite = decodeURIComponent(website);
diff --git a/packages/extension-polkagate/src/popup/authorize/AuthFullScreenMode.tsx b/packages/extension-polkagate/src/popup/authorize/AuthFullScreenMode.tsx
index 436cc7970..48d20add4 100644
--- a/packages/extension-polkagate/src/popup/authorize/AuthFullScreenMode.tsx
+++ b/packages/extension-polkagate/src/popup/authorize/AuthFullScreenMode.tsx
@@ -32,20 +32,19 @@ function AuthFullScreenMode ({ onNextAuth, onPreviousAuth, requestIndex, request
   const onAction = useContext(ActionContext);
   const { accounts } = useContext(AccountContext);
 
-  const url = requests[requestIndex].url;
-  const faviconUrl = useFavIcon(url);
+  const _url = requests[requestIndex]?.url;
+  const faviconUrl = useFavIcon(_url);
 
   const [selectedAccounts, setSelectedAccounts] = useState<string[]>([]);
   const [alreadySelectedAccounts, setAlreadySelectedAccounts] = useState<string[]>([]);
 
-
   const allAccounts = useMemo(() => accounts.map(({ address }) => address), [accounts]);
   const areAllCheck = useMemo(() => areArraysEqual([allAccounts, selectedAccounts]), [allAccounts, selectedAccounts]);
 
   useEffect(() => {
     getAuthList()
       .then(({ list: authList }) => {
-        const dappURL = extractBaseUrl(url);
+        const dappURL = extractBaseUrl(_url);
 
         const availableDapp = Object.values(authList).find(({ url }) => dappURL === extractBaseUrl(url));
 
@@ -57,7 +56,7 @@ function AuthFullScreenMode ({ onNextAuth, onPreviousAuth, requestIndex, request
         }
       })
       .catch(console.error);
-  }, [url]);
+  }, [_url]);
 
   const onApprove = useCallback((): void => {
     approveAuthRequest(selectedAccounts, requests[requestIndex].id)
@@ -118,7 +117,7 @@ function AuthFullScreenMode ({ onNextAuth, onPreviousAuth, requestIndex, request
               variant='circular'
             />
             <span style={{ fontSize: '15px', fontWeight: 400, overflowWrap: 'anywhere' }}>
-              {extractBaseUrl(url)}
+              {extractBaseUrl(_url)}
             </span>
           </Grid>
           <Grid container item sx={{ marginBottom: '15px', marginTop: '10px' }}>